diff options
author | Sudheer Shanka <sudheersai@google.com> | 2016-07-12 19:11:37 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 19:11:37 +0000 |
commit | cb7e0643c9e8cb990947300560e8c0c83ad6b5b4 (patch) | |
tree | b065b80b75c230a3aed29430db5ac9d11d1c4674 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 177422c91e392201beff0bd7b8e5edf6fc2c40eb (diff) | |
parent | d327d73edf9539805bea4b30a54fa82f071e43bc (diff) |
Merge \"DO NOT MERGE: Add pm operation to set user restrictions.\" into lmp-mr1-dev
am: d327d73edf
Change-Id: I131a01fb8d4ccd440a7727df2fde0ce433bc30d1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions