tree cce1f08d71b54d6a1414fb9bff4d043a3b888fa6
parent 7bbe73a4997b0c4fede7a192c294df062ab22def
parent 9d02ddad1fb2decc0bfbbc41340b02da24d37124
author Victor Khimenko <khim@google.com> 1594750692 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594750692 +0000

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