diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-29 14:50:06 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-29 14:50:06 +0000 |
| commit | 9dd38f3f12e84399ba3c901ca94569db81a26570 (patch) | |
| tree | 27538a6101c75339440c743ff698bddea7539dc9 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 40359e0322822cab3b6a00f3ce30a3cf0e7d7a6f (diff) | |
| parent | 6f2bb3a3c0697cbff6cf3b3ffde0c06cd911b9a9 (diff) | |
am 6f2bb3a3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
* commit '6f2bb3a3c0697cbff6cf3b3ffde0c06cd911b9a9':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions