| commit | 13e5f8e80d36e6b0a0fc1c6a472d5c73a29a50ef | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Thu Dec 10 03:05:40 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Thu Dec 10 03:05:40 2020 +0000 |
| tree | b5675827d9b618b366bcef3caf44a4cc9e58d9c0 | |
| parent | 59f81edbdb23ea3d0805286952442fc6336421ff [diff] | |
| parent | 0ee91db1db0b1c1b470b24187a5a56f521c91815 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 0ee91db1db -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: I1158b1e4f70b018504c963a76782c8773f698118