commit | a9b937b29d8e90f89ed3b3d99c8c3f8fa4c3f735 | [log] [tgz] |
---|---|---|
author | Sudheer Shanka <sudheersai@google.com> | Tue Jun 21 22:25:34 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 22:25:34 2016 +0000 |
tree | 55e07d239c1c780d949ba400e4e9cbba69af818a | |
parent | e0cc5e20aeba91689acd303d8694c8fa473526b8 [diff] | |
parent | 96676a2d412dec2abbaf09e69672f8e31ad5cc98 [diff] |
Merge \\"DO NOT MERGE: Add pm operation to set user restrictions.\\" into lmp-dev am: b43fe62933 -s ours am: 96676a2d41 Change-Id: I7a4cdbe7c6ed9abd51e0b172a24b69370edcc1b1