| commit | 3c30341b97ffe166328ba7a4b0e72e2e9cd072f9 | [log] [tgz] |
|---|---|---|
| author | Xin Li <delphij@google.com> | Fri Sep 11 03:58:59 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:58:59 2020 +0000 |
| tree | 1cdf2797ca6930b37cea2f5bcc682ed4d572a7be | |
| parent | b2aa183bbe92e97625a0d558f479e3b53bb32263 [diff] | |
| parent | 110fa824575714a14ea56e6f5595bd04cc095a16 [diff] |
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: 109e72941f -s ours am: 110fa82457 -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: I47087cabc2093c6de6116f11f660aa624dcb260e