diff options
| author | Baligh Uddin <baligh@google.com> | 2014-10-05 18:05:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-05 18:05:02 +0000 |
| commit | f7a9072e97822c67daf37a624c75512ff7e5e5ec (patch) | |
| tree | a35a5cb57ebcb4a6e7bbbfe3f21d813e6be70f4a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 26e89553489b962ad587c80ca326829a596b6ea6 (diff) | |
| parent | a37450f044dee6b6f7c5568cc815a988de4e90fc (diff) | |
am a37450f0: (-s ours) am ec3ce59c: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit 'a37450f044dee6b6f7c5568cc815a988de4e90fc':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions