| commit | 90eabb1afb42490e33a66c39d5ced1e9cddc7c31 | [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 | 8ce93bbe4941b4b811b4c18c6922e236a2f09b23 | |
| parent | 5aa8e25cddf0adc1ddd29337d4dc0c85a325b57d [diff] | |
| parent | c20bf732b16c1cb6c9e82566288afc57c1eef6dc [diff] |
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: b7fcf57c8d -s ours am: d0d979b032 -s ours am: c20bf732b1 -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