diff options
| author | Geoff Mendal <mendal@google.com> | 2015-03-16 13:14:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-16 13:14:52 +0000 |
| commit | c64f5ca02b16ebece40c21f401f75c7ace8178ac (patch) | |
| tree | 372aa2b4d785acc4d7e54488d648037f98491fa9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4777b612e07f57afbcf362b78b0b6e1e5e77e8bb (diff) | |
| parent | 0134869b5c81771ae3e3251fa42ac6c478e62f5a (diff) | |
am 0134869b: (-s ours) am 74c66d10: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
* commit '0134869b5c81771ae3e3251fa42ac6c478e62f5a':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions