| commit | b7fcf57c8d011488133272279cbc2d8d1d4ceb3a | [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 | ad35f252909e68aa9dfd8e929d0f679b3db276f0 | |
| parent | 6ab81ec60a8baf9c4464cfb6dc203f84e6810264 [diff] | |
| parent | 3b8bfc4811275503a5ac1ba8510db7bcdff8e18e [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