tree aab0d03acbd3a750216d1fe0cb581bef98548ff0
parent bf6845316ebc4d2e470970cfea1dbc31708dac6a
parent ab1b2f5637f8b47f27f29184569480bcd7b74c89
author Victor Khimenko <khim@google.com> 1594747782 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594747782 +0000

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

am skip reason: Change-Id Icf9e789e46ed1bcf660230e3011e88fa5e933fb5 with SHA-1 0987929f16 is in history

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

Change-Id: I6fe3f327b7ddb0f8ff3816cd9a1b65d791cbe3a1