Merge "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 am: cbe258aa27 -s ours am: 5b28589127 am: dbd5480ac4" into nyc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2016-07-12 20:08:38 +00:00
committed by Android (Google) Code Review

Diff Content Not Available