Skip to content
Commit 6ae7a5f7 authored by Sudheer Shanka's avatar Sudheer Shanka Committed by android-build-merger
Browse files

Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into... 

Merge \\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\" into lmp-mr1-dev am: d327d73e am: cb7e0643
am: 76c9d707  -s ours

Change-Id: I860be1d599fe60603b37ba8388a20c44c37d6f68
parents 7975dd5b 76c9d707
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment