| commit | 3d117d7efe0d687d6768439b74a43efb12bbb3ce | [log] [tgz] |
|---|---|---|
| author | Baligh Uddin <baligh@google.com> | Mon Feb 08 21:37:48 2021 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Mon Feb 08 21:37:48 2021 +0000 |
| tree | 50ac3e13c9eb0265e489d50912427227572bc8d9 | |
| parent | d1ea0447d0ca89ced656fd9f4dd825b07a35ef3e [diff] | |
| parent | c176e67d5a8f57cc89e5770302a53c51a5225747 [diff] |
[automerger skipped] Merge with history of PermissionController am: 73b6826a6f -s ours am: 88d01acab4 -s ours am: c176e67d5a -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: I53fc1779f4217534df19faea319cac5e9c265958