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