| commit | 01e7f22043c26b04a26a43c798405290a6ea3809 | [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 | fd6dd089a891e3b8803285aea97658b617c0029c [diff] | |
| parent | 6fe90d9859e435f7353d1a9a378ec494e2d2237a [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: efafd46947 -s ours am: 6fe90d9859 -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