tree aab0d03acbd3a750216d1fe0cb581bef98548ff0
parent 40aac00fcd6dde717426a35695a1a330a0525f4b
parent 0dd1ff0ffaea5082b59ac741c687bc91055bb2e4
author Victor Khimenko <khim@google.com> 1594749130 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594749130 +0000

[automerger skipped] Merge "Make media_ndk_headers buildable for native_bridge" into rvc-dev am: e943989e64 am: 0dd1ff0ffa -s ours

am skip reason: Change-Id Icf9e789e46ed1bcf660230e3011e88fa5e933fb5 with SHA-1 47ff5564d8 is in history

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

Change-Id: Ia5b887e3dbd433875e91345a1de16156f47f876e