| commit | 5dc4e52e20d4aa0cf487ebe6264ab3dc8d344770 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 21:27:28 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 21:27:28 2020 +0000 |
| tree | 83b57b3cd78cdf5136702e51c55e7dc5b0cd87f8 | |
| parent | 1043401f94fda2184d7aae293a46b1d9e9f81585 [diff] | |
| parent | a0c9117211965e259ff81194f7438d29a345555a [diff] |
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: a9f9ccbc9a -s ours am: 8db7491422 -s ours am: a0c9117211 -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: Iaa8c8357dffc8b79db12607cf6bf182ed6a62e74