| commit | a6eda0cf36f629e5849e704a6966ec3ea323b1c1 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Tue Jun 30 16:20:01 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 30 16:20:01 2020 +0000 |
| tree | 52b11f01e96724967de8852d8a4d0b5d79ee599a | |
| parent | d3842ab5e54cce0f1d9c196eae6e0ec0d8a84cf9 [diff] | |
| parent | 1e648c879a9048f5264c06b2797a041d58746aff [diff] |
[automerger skipped] Merge "Embed an sdkinfo proto in the test media apex" am: a380931857 am: 5508d92ec6 -s ours am: 04435f6bec -s ours am: 00300695bd -s ours am: 1e648c879a -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: I4d3e9b5edaf029f929c978811763b3877bf203ff