commit | 565d13f17e731e234fb731c6a79902cd04b4a35f | [log] [tgz] |
---|---|---|
author | Sudheer Shanka <sudheersai@google.com> | Tue Jun 21 23:14:52 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 23:14:52 2016 +0000 |
tree | 14bba77d1e4bf59c5a576ce9cec2888cf12d9732 | |
parent | 95c9bef53b0cd1a2eb9c15b2d2b77c2a276de877 [diff] | |
parent | 80e720742bfa8493b8a8413bfa63a25e94188cbe [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 am: 5e41f90a92 am: 80e720742b Change-Id: I745cd1c7129c79daa13c90fe6bbcef43cb39dce2