tree 3c1fac859c61720d624dcff777a02c972af51f0e
parent 903fb640c623b87b57989e369447106c621dec56
parent 5b28589127afbd4eda622970f7c25bbf135db672
author Sudheer Shanka <sudheersai@google.com> 1468353666 +0000
committer android-build-merger <android-build-merger@google.com> 1468353666 +0000

Merge \\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756  -s ours am: 6ae7a5f72b am: 322e70cef3 am: a730e5977e am: cbe258aa27  -s ours
am: 5b28589127

Change-Id: I1a8bfc2b3acb05edea636ba0c2e1eabaa83d8acb