| commit | 04435f6bec3e65c1d4cfd0e356b89a2d025fb696 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Tue Jun 30 15:42:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Tue Jun 30 15:42:15 2020 +0000 |
| tree | 6c22c043c55fd95e593c346f4e67c3e086929a2d | |
| parent | e877c46d86119769fdb7748f7fb4e313589c5c99 [diff] | |
| parent | 5508d92ec686db28fc1d7f2e8339dd85b77575f6 [diff] |
[automerger skipped] Merge "Embed an sdkinfo proto in the test media apex" am: a380931857 am: 5508d92ec6 -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: Ic6de9a7867bf2502a9db67c6d2146966d45737b2