diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-26 19:42:33 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-26 19:42:33 +0000 |
| commit | 9815e5ad92e47a2a23904ece53d5f6b10b82227e (patch) | |
| tree | eb8c2679596612dd8171ec27d01a206048459f44 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 2fe1ea16ef13c539d626ff6d801d7f8576cabaa6 (diff) | |
| parent | 2bf691436b828b2a71d3d9dc917a3b43adfed73d (diff) | |
am 2bf69143: (-s ours) am cb3a6f89: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '2bf691436b828b2a71d3d9dc917a3b43adfed73d':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions