| commit | adc09114882822b3d44749e785b80b7420f603d6 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Dec 10 03:05:15 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 03:05:15 2020 +0000 |
| tree | 6c2aab42df56cf1109bc9363963e5c442b6123b0 | |
| parent | c5970fd0dae18a15f7a673816aa8e817134c7255 [diff] | |
| parent | 9ad4faab01143ef30f817f3195507163b5e0e56a [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 9ad4faab01 -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: I1a85b5c9f263b31d89877255fa533e448ea9be34