diff options
| author | Sudheer Shanka <sudheersai@google.com> | 2016-06-21 22:12:17 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-21 22:12:17 +0000 |
| commit | 96676a2d412dec2abbaf09e69672f8e31ad5cc98 (patch) | |
| tree | fff59d20e945cc1d9cada96cec8c502b7998e960 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | db7e70c2f0b348ab7eab0edc427f3e38a357c668 (diff) | |
| parent | b43fe6293368e215100ab8799931bfbe45c82918 (diff) | |
Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-dev
am: b43fe62933 -s ours
Change-Id: Iad1cc5368a6617b648866cde91e51e5c0b8d68f5
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions