commit | 0dc3400c43f94e911c4217272ed2d5ab2ff9d049 | [log] [tgz] |
---|---|---|
author | Xin Li <delphij@google.com> | Fri Sep 11 03:33:28 2020 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Fri Sep 11 03:33:28 2020 +0000 |
tree | d7cec8ef21273afd88c4c85abde774370e96eb62 | |
parent | 879512ee3b3487f87437ccc0e71a611331d63223 [diff] | |
parent | ec49b75d0ab2636a765e08e2474129d28305a90a [diff] |
[automerger skipped] Merge "Merge Android R" am: 8ac6741e47 -s ours am: b9db5b54f6 -s ours am: ec49b75d0a -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: Idcd3d30dddc7818975b50aee1b253e37608a3eae