| commit | 26aa99aaf8c62b809cf6ecc28a225587526e6b62 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Dec 10 03:59:00 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 03:59:00 2020 +0000 |
| tree | ff51b16ae6006c03b35c7e7428d5e987295abb8b | |
| parent | 927a28ca2a203c9490278353029936f49e0c3429 [diff] | |
| parent | fd9a52a326c5696eab4eaae65af07507cb358e9c [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 9bc851c855 -s ours am: 16373928b1 -s ours am: fd9a52a326 -s ours am skip reason: subject contains skip directive Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520888 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id78860e6761ba4c4954c02508f16ae975e1fb161