| commit | 8fdc3926b5391512e9e89e1c7314324d2da69ced | [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 | b5675827d9b618b366bcef3caf44a4cc9e58d9c0 | |
| parent | 402f439ac1082f7a974d55660035d34935c9424a [diff] | |
| parent | 13e5f8e80d36e6b0a0fc1c6a472d5c73a29a50ef [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 0ee91db1db -s ours am: 13e5f8e80d -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