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 am: 565d13f17e -s ours am: e4e424d80d am: d049736c79

am: d270f00e1c  -s ours

Change-Id: Ie02275d8beaf3c9a1f2eade2d5561aa181c57afe
This commit is contained in:
Sudheer Shanka
2016-06-22 00:27:06 +00:00
committed by android-build-merger

Diff Content Not Available