commit | e8bae87a069907bb7a7fa13dbec2f063e8863d97 | [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 | 1a84027a46cf29621f8988e14acb09dc8365bb37 | |
parent | 3d818137f3732cda5162274de8ad3c44d67a4307 [diff] | |
parent | c4221b6a753b2dc6007a00d75896ebd7090a0d28 [diff] |
Merge changes from topics "pans", "pans-permission" am: 68658a18c7 am: 6e19867390 am: c4221b6a75 Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1561317 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I20fdb2f06b473f9f92e62138e72bd30d4384a267