| commit | d75731b1243504459e249d2af28626f3cfdef938 | [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 | d5a5a327d6bef024d5722af9aaaa0b6675296061 | |
| parent | bc0e7c7956b32ae019a639d729697f00c5507b78 [diff] | |
| parent | 94183c9cb8f6e325355060910bbb3bf079134f28 [diff] |
[automerger skipped] Merge "DO NOT MERGE - Merge Android R QPR1" am: 7b4d6dcf27 -s ours am: 94183c9cb8 -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