diff options
| author | Geoff Mendal <mendal@google.com> | 2014-11-19 15:35:38 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-19 15:35:38 +0000 |
| commit | 0dffaa1ea0f4322d567ad3e7201e95e46273dd95 (patch) | |
| tree | dd0ef8d3641d91f6ee30857a931b0cb2a1d38f37 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 9da2791f69c625e141003b636e414e1d5794fc70 (diff) | |
| parent | 49a93f520fc505df61713b3323e9da9e7559c7d0 (diff) | |
am 49a93f52: (-s ours) am 0014addf: (-s ours) am 04b6a6d3: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '49a93f520fc505df61713b3323e9da9e7559c7d0':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions