Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-mr1-dev am: d327d73edf am: cb7e0643c9

Browse Source

am: 76c9d70756  -s ours

Change-Id: I860be1d599fe60603b37ba8388a20c44c37d6f68

...

This commit is contained in:

Sudheer Shanka

2016-07-12 19:27:39 +00:00

committed by android-build-merger

parent 7975dd5b48 76c9d70756

commit 6ae7a5f72b

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available