commit | 47da8a0bdc9b401ae103a629761844ffd177960a | [log] [tgz] |
---|---|---|
author | Sudheer Shanka <sudheersai@google.com> | Tue Jun 21 22:31:11 2016 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Jun 21 22:31:11 2016 +0000 |
tree | c994a85d2a2cdd31e844d57b6e95e7e4a2395d26 | |
parent | 0d457d125458d76e8821dad1d72ed822a1909b34 [diff] | |
parent | a9b937b29d8e90f89ed3b3d99c8c3f8fa4c3f735 [diff] |
Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-dev am: b43fe62933 -s ours am: 96676a2d41 am: a9b937b29d Change-Id: Ib0923227e223a7b3a94e4d443e6e5c308977e65b