diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-07-12 19:59:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 19:59:12 +0000 |
| commit | 45393c8b85348262d73684c0ec5a04aaa2069e8e (patch) | |
| tree | d345b2a3eda2c64bcd9bb5fea9db7b795da631c8 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 8fed0636c8f5db2c04da7230a63f0ac5be92e207 (diff) | |
| parent | 5b28589127afbd4eda622970f7c25bbf135db672 (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
Change-Id: Id67b945304514fb291021ad30835ecb8f04e0cfb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions