diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-07-12 20:12:51 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 20:12:51 +0000 |
| commit | c994b7cc516369866afb731cd40877778278a318 (patch) | |
| tree | 65138e4d1c9bf05aca6389a248a6685468b7adbd /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | b1e44b13e74ee24ed0e9fcb87b2074c30e488b3d (diff) | |
| parent | 1df2fc563eba861e6ede8500b3efb14b4d223ff8 (diff) | |
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: 45393c8b85
am: 1df2fc563e -s ours
Change-Id: If8a6a90c1090bfa51eb646b077a093de7a02f3c9
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions