tree 2a02c323e216561dae30035fa97bd12bc63f3c02
parent 2534713d78910184579b8dfa7d4881630f039104
parent fac344fd091d822410133d8401bdc507a496fbba
author Treehugger Robot <treehugger-gerrit@google.com> 1591225388 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1591225388 +0000

Merge "Fix C compatibility in header." am: e06d19ff2c am: de35d2de57 am: 2cfdd9cd30 am: 91e6aaf902 am: fac344fd09

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1323276

Change-Id: Ieb960ac271ae4efa210539d3d307f7cd26b77499