commit | d049736c7982be91cf229a76b303c188734d7d70 | [log] [tgz] |
---|---|---|
author | Sudheer Shanka <sudheersai@google.com> | Tue Jun 21 23:33:36 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 23:33:36 2016 +0000 |
tree | 4f2afee494520b322c9248650e3cb55b9fd3b95e | |
parent | c2ca4066838bbbcde4e065134c58f58a89511537 [diff] | |
parent | e4e424d80d87db739866a9a07d8fbe9da5f75eaa [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 am: e4e424d80d Change-Id: I228853b196bd660f3c55f616278700e6623f9783