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 am: e01775f0be am: 5e41f90a92

am: 80e720742b

Change-Id: I745cd1c7129c79daa13c90fe6bbcef43cb39dce2
This commit is contained in:
Sudheer Shanka
2016-06-21 23:14:52 +00:00
committed by android-build-merger

Diff Content Not Available