diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-07-12 20:01:06 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 20:01:06 +0000 |
| commit | dbd5480ac464579c55e7692c2e9f0bb3dcddfe17 (patch) | |
| tree | 3c1fac859c61720d624dcff777a02c972af51f0e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 903fb640c623b87b57989e369447106c621dec56 (diff) | |
| parent | 5b28589127afbd4eda622970f7c25bbf135db672 (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
Change-Id: I1a8bfc2b3acb05edea636ba0c2e1eabaa83d8acb
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions