| commit | 1be5c805d6c117335e9e652bafdc9c8727a164aa | [log] [tgz] |
|---|---|---|
| author | James Mattis <jmattis@google.com> | Sun Feb 14 09:51:16 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sun Feb 14 09:51:16 2021 +0000 |
| tree | ecc3cac4128c9aa0728b5e7d8c6c92873a0ff053 | |
| parent | e3d5ac6fdae8eb31e0f9efcc8b5020ced445c39a [diff] | |
| parent | 700e96935929d6a54129872c721fd58f8380df27 [diff] |
Merge changes from topics "pans", "pans-permission" am: 601d16a336 am: 700e969359 am: 6c16aeadfb Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561317 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I20fdb2f06b473f9f92e62138e72bd30d4384a267