commit | 5e41f90a927dd9b5ed454130a2b9d8f779a058d5 | [log] [tgz] |
---|---|---|
author | Sudheer Shanka <sudheersai@google.com> | Tue Jun 21 22:42:25 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 22:42:25 2016 +0000 |
tree | 83659b87325f5bef8d2df794e17c91b17849c382 | |
parent | 06c3f60136b8ab5a4359fda53b0f675adc64a392 [diff] | |
parent | e01775f0be3222ab5bdcded33d22a624d23578fb [diff] |
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 Change-Id: Ia4ac90dc59c50aabd1c3de69885c1312e37d915a