commit | 6fe90d9859e435f7353d1a9a378ec494e2d2237a | [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 | 6f3c1295e9c53c29b3b1ea74be755c9963bbe57b [diff] | |
parent | efafd4694728ebc8257be58d27810dd16fc0e851 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: efafd46947 -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