tree 6c22c043c55fd95e593c346f4e67c3e086929a2d
parent 62eb44f9a4f099d3c8e438aa30d0125a698b78b1
parent 04435f6bec3e65c1d4cfd0e356b89a2d025fb696
author Anton Hansson <hansson@google.com> 1593532458 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1593532458 +0000

[automerger skipped] Merge "Embed an sdkinfo proto in the test media apex" am: a380931857 am: 5508d92ec6 -s ours am: 04435f6bec -s ours

am skip reason: Change-Id If98002f378c82d7d1d1454b40b285c3a4f3ed959 with SHA-1 9ff91b4efd is in history

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

Change-Id: I8536c0e0d74987b84d6250fe8e7723dfde592e21