| commit | 63d29afac218cf02e76cd1c1c48b7a0387c4022f | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Dec 10 03:46:53 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 03:46:53 2020 +0000 |
| tree | ecfa64a094ff2d4c1b48f83adb494c90830d65f5 | |
| parent | deddbbc1a45db2e9ce86d7fbbf5767eaa7f41ebe [diff] | |
| parent | adc09114882822b3d44749e785b80b7420f603d6 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 9ad4faab01 -s ours am: adc0911488 -s ours am skip reason: Change-Id I5fe0f4309a3d7bf81b29cafa90b38a74203146ff with SHA-1 c5970fd0da is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1521222 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I803a31945a4f70a3010e1c6cd718d96c9be9beab