| commit | 94183c9cb8f6e325355060910bbb3bf079134f28 | [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 | f4e04c5f7d6a9b363a79aee643864fd4bf42bb9b | |
| parent | 8c4abeb23f126730aceedfd675829b0be06b5bed [diff] | |
| parent | 7b4d6dcf27e6f2881e8539c8d246959dc395486b [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 7b4d6dcf27 -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