diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-07-12 20:06:53 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 20:06:53 +0000 |
| commit | 1df2fc563eba861e6ede8500b3efb14b4d223ff8 (patch) | |
| tree | edc24b665db7cf5c40140c352fa6f44e86fe3d0d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2e84585c4dde87aa311faef5c0463006ee0c5280 (diff) | |
| parent | 45393c8b85348262d73684c0ec5a04aaa2069e8e (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
Change-Id: Ied475a3054b317b91a5e10108f9a271b41e81422
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions