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