tree aab0d03acbd3a750216d1fe0cb581bef98548ff0
parent 876a6d0c837980af04eacbf5bc6e925d4b2e9d34
parent 14e5956d05742abd1d35675c68d8dfc0e272c76a
author Victor Khimenko <khim@google.com> 1594750479 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594750479 +0000

[automerger skipped] Merge "Make media_ndk_headers buildable for native_bridge" into rvc-dev am: e943989e64 am: 0dd1ff0ffa am: 14e5956d05 -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: I495e19ab4fca4efc904daec52fc6b46c07b15b4f