OSDN Git Service

Merge \\\\\\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\\...
authorSudheer Shanka <sudheersai@google.com>
Wed, 22 Jun 2016 00:16:09 +0000 (00:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 22 Jun 2016 00:16:09 +0000 (00:16 +0000)
commitd7affea299d4dc5e200033b53f45dc048fdab242
treef35db4dcf0cbb18666742a68f268dd8871da24e1
parent0195207b37e9b43199b79b4b56cea1c07b7f466f
parent44f24379cf1dd8204872e91d0bedb4f149071d95
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
am: 44f24379cf

Change-Id: I17307c3011b7bcf5fc2e2c5a8a1e707227bc36b7