summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorGeoff Mendal <mendal@google.com>2015-01-15 23:45:54 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-15 23:45:54 +0000
commitd3403e45d6d89d0307c0fc9427cc84792ac6ee83 (patch)
tree93f067599f4891c5d0629df9e1a5b1b9a2c977c3 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent41d54237380d5f3c06ab2a71715e22f048278ecf (diff)
parentfaf92d725649337a29312603dc8c10a3f0ee103a (diff)
am faf92d72: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'faf92d725649337a29312603dc8c10a3f0ee103a': Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions