| commit | 9edd79026be6224b17d710c22365fdffc5b662fd | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 02:02:37 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 02:02:37 2020 +0000 |
| tree | 2f6d04ba83ffbc64901a014052ded1e9c90c6607 | |
| parent | 7665cd403d1951c95f012ba0c6a4cb83ff39d8a9 [diff] | |
| parent | fa3369f7f56ead4967dd173e79422e3d5266eb54 [diff] |
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -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: Ie915db11679ce05f5d37815028015f61ffb1a4a6