| commit | 59b852af391ab61cc67429ad60ea8d5a2676eb5a | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:28 2020 +0000 |
| tree | 84ec0e2f07f422708adcc8f552f6feac748c5f1f | |
| parent | 7c49a8c13c4e7f2cbbb093b7801278f5bda929a2 [diff] | |
| parent | 4d279942b48f4a3f5da9e163162110c89d187ad0 [diff] |
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: 4d279942b4 -s ours am skip reason: Change-Id Ice3e441cc9c0df8d0a6acc016bb74375e081bd67 with SHA-1 ec82033d3e is in history Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1422395 Change-Id: Idcd3d30dddc7818975b50aee1b253e37608a3eae