tree 83659b87325f5bef8d2df794e17c91b17849c382
parent 9bfa0ad22f2ab3fe1179f12b436d91ef34a0c829
parent 144b3a42cc8ea3f186f68a22c51d0ee997000f29
author Sudheer Shanka <sudheersai@google.com> 1466547107 +0000
committer android-build-merger <android-build-merger@google.com> 1466547107 +0000

Merge \"Add pm operation to set user restrictions.\" into mnc-dev
am: 144b3a42cc

Change-Id: I1de4650ef53751654145a3ad1c40390711414341