tree ba6a16f5d99f40cb17f4fb0d4e07d982fa8475d9
parent e212a01efea33d7caa7792a550053c0a488cc8aa
parent 3d8cef1fa8538c67ed8960c5c35244568262e6a5
author Hai Zhang <zhanghai@google.com> 1551299443 -0800
committer android-build-merger <android-build-merger@google.com> 1551299443 -0800

Merge "Add OBSERVE_ROLE_HOLDERS permission to shell."
am: 3d8cef1fa8

Change-Id: Id4d2229546b9a8469a6ec2abb897ec620f82995b