| commit | ec49b75d0ab2636a765e08e2474129d28305a90a | [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 | d7cec8ef21273afd88c4c85abde774370e96eb62 | |
| parent | db703a50ab31a94e5110f096a2f58259389cd187 [diff] | |
| parent | 0d60fd800f7b258d26b790d5f109e16199b92447 [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