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

am: dbd5480ac4

Change-Id: I34c96ae206bcf3301f4151f4584e00bd1c1ce4f8
This commit is contained in:
Sudheer Shanka
2016-07-12 20:08:03 +00:00
committed by android-build-merger

Diff Content Not Available