diff options
| author | Geoff Mendal <mendal@google.com> | 2015-02-25 17:26:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-25 17:26:53 +0000 |
| commit | 084f4a50399b1d2e1687f32f5efd0b49f457f5f5 (patch) | |
| tree | dfa7bb9f144869f7fe6266887195fec9ddc1f040 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 313fd897ea29922fb6afbd0bc31b9827255d2bfa (diff) | |
| parent | 336beed4d1006211139ab0b8e34227b364f17899 (diff) | |
am 336beed4: (-s ours) am aee4a86a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '336beed4d1006211139ab0b8e34227b364f17899':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions