commit | 16373928b1cb74c5424a32928f9189e128c454d1 | [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 | dba10b874e9f7be76679046c76599422791e34a0 | |
parent | b34f8fe74e565b03866804157349b4fc80ca26c3 [diff] | |
parent | 9bc851c855e3351bfa46b4ca353fcf045560a7d5 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 9bc851c855 -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