tree dfa9209b5825fbdabb2c72d1bc89720903623627
parent 2c4dd46e98f00885a5af2f1ce92eecb4a543458d
parent 60d96eb3d6e266734b392ce56caa3b71674e349b
author Android Build Merger (Role) <noreply-android-build-merger@google.com> 1529389337 +0000
committer Android Build Merger (Role) <noreply-android-build-merger@google.com> 1529389337 +0000

[automerger] Merge "Adjusting restrictions applied to non-admins." into pi-dev am: ed7a40040e am: 60d96eb3d6

Change-Id: Ia073d7ca4e39ed073fc86b821a8abae832e36584