diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-06-21 23:47:44 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-21 23:47:44 +0000 |
| commit | d270f00e1c9bfeef860731f4a192273db45fd1a7 (patch) | |
| tree | 8327b5c24d6b2d0132fc2851c0437062c7a1d216 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 122329cb65000e61a5c5d90145a7b3177fe06b21 (diff) | |
| parent | d049736c7982be91cf229a76b303c188734d7d70 (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: d049736c79
Change-Id: I1d644b84222e6820fb84a49fca296dc245efb958
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions