| commit | fd9a52a326c5696eab4eaae65af07507cb358e9c | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Dec 10 03:47:00 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 03:47:00 2020 +0000 |
| tree | dba10b874e9f7be76679046c76599422791e34a0 | |
| parent | 12ba96319a99abd19c5b8401aebc40f2bf4610c7 [diff] | |
| parent | 16373928b1cb74c5424a32928f9189e128c454d1 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 9bc851c855 -s ours am: 16373928b1 -s ours am skip reason: Change-Id Ib81ba3288a986546bc570c3759c55d026add591a with SHA-1 3cfbcbee16 is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1520888 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic11fc264d783e729729854a5f7f7b03d38d43e3e