diff options
| author | Geoff Mendal <mendal@google.com> | 2015-03-25 15:50:43 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-25 15:50:43 +0000 |
| commit | b0d49833be8a00a8466aeea6a839869371a90425 (patch) | |
| tree | c2d62dbfc62e63bfc0d259c43a7b20030f204dbc /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3325448639df3ae629fbb33666c9e6c25d306a28 (diff) | |
| parent | d86a584f101a5932a8fa2b686ef052e22e004854 (diff) | |
am d86a584f: (-s ours) am 9cfd002e: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-modular-dev
* commit 'd86a584f101a5932a8fa2b686ef052e22e004854':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions