tree ce98662c7347bf0c6526ace4e8aac5e65e189b7a
parent 199f6a490a9ae01cbd428302e38c2905b6907606
parent 47da8a0bdc9b401ae103a629761844ffd177960a
author Sudheer Shanka <sudheersai@google.com> 1466548606 +0000
committer android-build-merger <android-build-merger@google.com> 1466548606 +0000

Merge \\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\" into lmp-dev am: b43fe62933  -s ours am: 96676a2d41 am: a9b937b29d
am: 47da8a0bdc  -s ours

Change-Id: Idf654d72b81e9f4c4219f2b7a5f14ba3be021438