diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-07-12 20:08:03 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 20:08:03 +0000 |
| commit | 110beb4484f18f1461edb786e188b1e38bba4733 (patch) | |
| tree | edc24b665db7cf5c40140c352fa6f44e86fe3d0d /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | 0195ee1b018606cd8a1e86e394322a69f38b5a54 (diff) | |
| parent | dbd5480ac464579c55e7692c2e9f0bb3dcddfe17 (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: dbd5480ac4
Change-Id: I34c96ae206bcf3301f4151f4584e00bd1c1ce4f8
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions