| commit | c20bf732b16c1cb6c9e82566288afc57c1eef6dc | [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 | ad35f252909e68aa9dfd8e929d0f679b3db276f0 | |
| parent | 743fd239c947c617e5b2aacfdf59c33d2096d18e [diff] | |
| parent | d0d979b03208108ccf3a150f70afac5a90cc404a [diff] |
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: b7fcf57c8d -s ours am: d0d979b032 -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