2833e406e07b04af0533c3b585db36afaa17e11c - platform_frameworks_base

commit	2833e406e07b04af0533c3b585db36afaa17e11c	[log] [tgz]
author	Bryan Ferris <bferris@google.com>	Tue Apr 09 19:46:49 2019 +0000
committer	Android (Google) Code Review <android-gerrit@google.com>	Tue Apr 09 19:46:49 2019 +0000
tree	110e3bf1cb17a61001c75028faf151b1da32badd
parent	18e7dedf6c35f07daf8b7239d501737745ac7f43 [diff]
parent	8e5c88b1ea6b3b2ae7b297b4253ade8de678e7a4 [diff]

Merge changes from topic "am-e391c592-eeb3-4cc9-85fd-fa5d3bf694c5" into oc-dev

* changes:
  [automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 7b5a576965 am: 0494ac6568 am: 70b534799b am: 49a505f4f9 skipped: 022bfaa808
  [automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 7b5a576965 am: 0494ac6568 am: 70b534799b am: 49a505f4f9
  [automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 7b5a576965 am: 0494ac6568 am: 70b534799b
  [automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 7b5a576965 am: 0494ac6568
  [automerger] [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser. am: 7b5a576965
  [RESTRICT AUTOMERGE] Added missing permission check to isPackageDeviceAdminOnAnyUser.

tree: 110e3bf1cb17a61001c75028faf151b1da32badd