From: Sudheer Shanka <sudheersai@google.com>
Date: Tue, 12 Jul 2016 19:47:49 +0000 (+0000)
Subject: Merge \\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\" into... 
X-Git-Tag: android-x86-7.1-r1~3090^2~19^2~10
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cbe258aa27;p=android-x86%2Fframeworks-base.git

Merge \\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9 am: 76c9d70756  -s ours am: 6ae7a5f72b am: 322e70cef3
am: a730e5977e

Change-Id: Ic3f93423fed99fe6e1b1142e9f949866897954ae
---

cbe258aa2792ebf353f69bfd5770e678e51a7100