commit | 44f24379cf1dd8204872e91d0bedb4f149071d95 | [log] [tgz] |
---|---|---|
author | Sudheer Shanka <sudheersai@google.com> | Tue Jun 21 23:56:51 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 23:56:51 2016 +0000 |
tree | 502626a427587f6985972438fc1119d836a20230 | |
parent | e8af546d371f8f4f6f38d95fbf4b85fcff483a26 [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: I856ba4adbe083a1fd0ca25921a8e717b7d9ca169