summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2014-12-15 15:20:08 +0000
committerandroid-build-merger <android-build-merger@google.com>2014-12-15 15:20:08 +0000
commit6b873a0db126c2b93cd1310d863f7280f8a72b25 (patch)
tree880742e580e6f4a7444b49e4a8b8cb45ad3b417f /tools/aapt2/java/JavaClassGenerator.cpp
parent38706fc7994d8aa34555a8bc8d5037f6df2daca3 (diff)
parentea964156460bbe8ab8f03c8de5f9f529234d69ce (diff)
am b73e02cf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
automerge: ea96415 -s ours * commit 'ea964156460bbe8ab8f03c8de5f9f529234d69ce': Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions