| commit | c80e7b970c51a93878ec209a2e5d4d65d663bb8a | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Dec 10 03:58:53 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 03:58:53 2020 +0000 |
| tree | b6d042a051ef4d3f84fb5676e17f8faeecaf44a6 | |
| parent | 141683dd38a64970f1c73b8ae73f66cced6db493 [diff] | |
| parent | 63d29afac218cf02e76cd1c1c48b7a0387c4022f [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 9ad4faab01 -s ours am: adc0911488 -s ours am: 63d29afac2 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/1521222 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9b313fdc24ca11d5164bc4bfaea7a50abc677db8