commit | d11f866ee61033d574dc4e01139a0dc86054896f | [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 | 73c4b43dc879fae435973b1b761d0a580177169f | |
parent | a9f241bb437bfc4542a4ee3a5da65014eb5b510c [diff] | |
parent | 601d16a336db896e5bc91b8538ceb1065848d17a [diff] |
Merge changes from topics "pans", "pans-permission" am: 601d16a336 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561317 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I72035b6d5d6504cece1df472ae317e865ceb7882