diff options
| author | Geoff Mendal <mendal@google.com> | 2014-12-17 16:38:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-17 16:38:07 +0000 |
| commit | 831969a2257a476d091f505c3916ab966862e645 (patch) | |
| tree | b70387a84ee3a1aba57765e801c8ba78cf65cbb3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a79f074b760bf6ec0c9a41c8ca7f7cc946317b6c (diff) | |
| parent | 3c58e4ca2c01dce84d3a89a40d2de7569ba87fe3 (diff) | |
am 3c58e4ca: (-s ours) am 2e2fd473: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '3c58e4ca2c01dce84d3a89a40d2de7569ba87fe3':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions