commit | 873cfb8d94c8ccc082d788539d1eef651f84d9d9 | [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 | fb1320bec3ded6d2f373570b5d8cfe44cef4f232 | |
parent | 64c43bffffa4745319a011bfa56a1514833598b6 [diff] | |
parent | 0dc3400c43f94e911c4217272ed2d5ab2ff9d049 [diff] |
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: ec49b75d0a -s ours am: 0dc3400c43 -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