diff options
| author | Geoff Mendal <mendal@google.com> | 2015-01-16 20:52:29 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-16 20:52:29 +0000 |
| commit | eef5734d96cd05deab581cdcfebc61533fc25cf6 (patch) | |
| tree | b738bcf77f6e9a65b048a36684ed59c454904b1c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 57653fc4a4f5f7e52719d2154fd2582ef8646e35 (diff) | |
| parent | 3891ce73206d4cf74c6aec1d5bf1b2b89fb90cb2 (diff) | |
am 3891ce73: (-s ours) am 2c8e6daa: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev
* commit '3891ce73206d4cf74c6aec1d5bf1b2b89fb90cb2':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions