tree cce1f08d71b54d6a1414fb9bff4d043a3b888fa6
parent dd17c1181911b36a13f6349fc0f1bad17092fa08
parent 019a4d758ac822be144644c4918cae552cd996d8
author Victor Khimenko <khim@google.com> 1594750173 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1594750173 +0000

[automerger skipped] Merge "Make media_ndk_headers buildable for native_bridge" into rvc-dev am: e943989e64 -s ours am: ab1b2f5637 -s ours am: 40aac00fcd -s ours am: 019a4d758a -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: I67f76db5b6bd3757b419525700f3cecffd622428