commit | c176e67d5a8f57cc89e5770302a53c51a5225747 | [log] [tgz] |
---|---|---|
author | Baligh Uddin <baligh@google.com> | Mon Feb 08 20:51:42 2021 +0000 |
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 08 20:51:42 2021 +0000 |
tree | 138ed8fbc87d49afacb688620f1368212b491673 | |
parent | d522dcf9866e4589b5b15c77e740bd56ef9f75d9 [diff] | |
parent | 88d01acab4593b179f745c61054419a6dcd9d815 [diff] |
[automerger skipped] Merge with history of PermissionController am: 73b6826a6f -s ours am: 88d01acab4 -s ours am skip reason: Change-Id I16cc0e9742f196de9afbecc1bf0788c2f12bc4d0 with SHA-1 2f0b2bbf3d is in history Original change: https://android-review.googlesource.com/c/platform/packages/modules/Permission/+/1579744 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I46ea09b42cf915c9797abcb3de2657b214320f15