diff options
| author | Geoff Mendal <mendal@google.com> | 2015-03-04 13:47:46 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-04 13:47:46 +0000 |
| commit | 97735297307eccc3cedb537fe88a2a76d473f798 (patch) | |
| tree | 7d5baa6fdc44257dc28edef4cc78070ea8293bc7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 89a2b286ae69858a999d050ac30fdf171dee6d1c (diff) | |
| parent | 42796e97f64ee7ab3dafaf2daf9ebbc2f35030a2 (diff) | |
am 42796e97: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit '42796e97f64ee7ab3dafaf2daf9ebbc2f35030a2':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions