diff options
| author | Geoff Mendal <mendal@google.com> | 2015-01-15 23:51:22 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-15 23:51:22 +0000 |
| commit | 6ba9c529fda8aba5f1157b4ff3feb1a494e673ad (patch) | |
| tree | 88ea77f7f62c2f31257785c5193b4c51472ac297 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | b523c55d76ef3215538158a65bdea70c9897993e (diff) | |
| parent | d3403e45d6d89d0307c0fc9427cc84792ac6ee83 (diff) | |
am d3403e45: (-s ours) am faf92d72: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit 'd3403e45d6d89d0307c0fc9427cc84792ac6ee83':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions