diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-07-12 20:20:13 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 20:20:13 +0000 |
| commit | 3b457c74d98f8498e6cee85666d26482c220fb6c (patch) | |
| tree | 65138e4d1c9bf05aca6389a248a6685468b7adbd /packages/DocumentsUI/src/com/android/documentsui/DocumentClipper.java | |
| parent | 5396c6cd8553b95b852c045a27664bb02c13b890 (diff) | |
| parent | 894dd710b124279d5cb86d7f4b5750264398f1a1 (diff) | |
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
am: 894dd710b1 -s ours
Change-Id: I26b62d08e1e5185b2395615348ea5007cb5973fa
Diffstat (limited to 'packages/DocumentsUI/src/com/android/documentsui/DocumentClipper.java')
0 files changed, 0 insertions, 0 deletions