commit | e4e424d80d87db739866a9a07d8fbe9da5f75eaa | [log] [tgz] |
---|---|---|
author | Sudheer Shanka <sudheersai@google.com> | Tue Jun 21 23:17:44 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 23:17:44 2016 +0000 |
tree | eaa0b0b1126ab15d4719c4d50273da69d55d049c | |
parent | 00e79982aa743579d34f988f0f09aec19fde6ee4 [diff] | |
parent | 565d13f17e731e234fb731c6a79902cd04b4a35f [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 am: 565d13f17e -s ours Change-Id: I141d8fb97fc5aac644ef50ff07f055ec7a03823e