summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2016-01-11 15:37:27 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-01-11 15:37:27 +0000
commit73992aee94ce78b8827fe05bb5537068a96c835d (patch)
tree86d58723d07ee18e9db265b9fa930f9193fff671 /tools/aapt2/java/JavaClassGenerator.cpp
parent14c37a57eaf9fe962fe7ee9ecb33bc883ededf7b (diff)
parent66841a62f1d71eba843e69d1c8b5ca9453c5b42b (diff)
Merge "Revert "Import translations. DO NOT MERGE"" into lmp-mr1-ub-dev
am: 66841a62f1 -s ours * commit '66841a62f1d71eba843e69d1c8b5ca9453c5b42b': Revert "Import translations. DO NOT MERGE"
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions