tree 59ca5c895093595a5c60a64c3ca66b2f655e938d
parent 5b420a7b44decf6f69bc21d0a15d09baa75c474b
parent 9457779aa4ce01064bac82c506f2e9e54c896c65
author Sudheer Shanka <sudheersai@google.com> 1469861007 +0000
committer android-build-merger <android-build-merger@google.com> 1469861007 +0000

Merge \\\\\\"DO NOT MERGE: Allow apps with CREATE_USERS permission to call UM.getProfiles.\\\\\\" into lmp-mr1-dev am: dbbdb6d089 am: 9ed6bd83ff am: 28acd0fae9  -s ours am: 98ae56902e am: 382f9aadcd
am: 9457779aa4

Change-Id: Ib123df6f044bb7a5323235a4aafe69b04865acfa