tree 93a6e0a449119551820153691d8bff7607bee5e0
parent a3ac89586b1b4cc56ba10986ae6c184a7db2e3f6
parent 40676e7cba898f4be1621ad6b7a50929de629cdf
author Jean-Michel Trivi <jmtrivi@google.com> 1539370886 -0700
committer android-build-merger <android-build-merger@google.com> 1539370886 -0700

Merge "Fix call to function sbrDecoder_Header() through pointer to incorrect function type." am: fb65c0c24b
am: 40676e7cba

Change-Id: I07d03570c8173eff319c102ce73c51025afdd056