diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-06-21 23:10:54 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-21 23:10:54 +0000 |
| commit | 80e720742bfa8493b8a8413bfa63a25e94188cbe (patch) | |
| tree | b5439874f1995d98eca7220060059d4ea1189692 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9088be4ebe3602898c7c208e787055697d04862a (diff) | |
| parent | 5e41f90a927dd9b5ed454130a2b9d8f779a058d5 (diff) | |
Merge \\\\\\"DO NOT MERGE: Add pm operation to set user restrictions.\\\\\\" into lmp-dev am: b43fe62933 -s ours am: 96676a2d41 am: a9b937b29d am: 47da8a0bdc -s ours am: e01775f0be
am: 5e41f90a92
Change-Id: I5b9897a2a3e44faed6f101c52ab729612404c739
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions