diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-06-22 00:16:09 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-22 00:16:09 +0000 |
| commit | d7affea299d4dc5e200033b53f45dc048fdab242 (patch) | |
| tree | f35db4dcf0cbb18666742a68f268dd8871da24e1 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 0195207b37e9b43199b79b4b56cea1c07b7f466f (diff) | |
| parent | 44f24379cf1dd8204872e91d0bedb4f149071d95 (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 am: 80e720742b am: 565d13f17e -s ours am: e4e424d80d
am: 44f24379cf
Change-Id: I17307c3011b7bcf5fc2e2c5a8a1e707227bc36b7
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions