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

am: 72f73bc52e  -s ours

Change-Id: Ice85276bd0b1869a79f2e190c384a893a88859c7
This commit is contained in:
Jean-Michel Trivi 2018-10-12 12:06:34 -07:00 committed by android-build-merger
commit 4b6bb41eb1

Diff Content Not Available