commit | 6e19867390c9a6313046ee174d82a141a860bf45 | [log] [tgz] |
---|---|---|
author | James Mattis <jmattis@google.com> | Sat Feb 13 21:14:48 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Feb 13 21:14:48 2021 +0000 |
tree | 62fba769b57609ab3dd97c6096ef5912bd2fde6c | |
parent | 66b74e588b93bc32a60575383845ca148998037a [diff] | |
parent | 68658a18c7b524b9c56142103f4e442e4c3a185b [diff] |
Merge changes from topics "pans", "pans-permission" am: 68658a18c7 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561317 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I72035b6d5d6504cece1df472ae317e865ceb7882