diff options
| author | Baligh Uddin <baligh@google.com> | 2014-09-29 21:02:41 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-29 21:02:41 +0000 |
| commit | 374b10b58b7586689880cfd64342d1160d3a3532 (patch) | |
| tree | eaa113bd4bb5f52de29ff0349a1d371170af57ab /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | e037c0b1ad9bb82fd069bd09fe9582864d922466 (diff) | |
| parent | 7e40778bae0c58173116fb7e6d250abfdb9b5250 (diff) | |
am 7e40778b: (-s ours) am 37960312: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '7e40778bae0c58173116fb7e6d250abfdb9b5250':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions