tree e5423a2679546adc1fc4c5b602d8fb159b70811e
parent febf87fde11411420cbd527dbba89f364252c6b6
parent 8a0ce64177e876f38d4d2570119859fa89af11d0
author Neil Fuller <nfuller@google.com> 1601459515 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1601459515 +0000

Merge "Add a new permission in AOSP" am: 4b22e7c281 am: 1f728acac0 am: 8a0ce64177

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1440636

Change-Id: I0c4deb866e86feb77fe898e4bf643cd45ad9f086