diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-19 03:18:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 03:18:07 +0000 |
| commit | 84b22cd7df7691e8ab73254b7a0a729db112e990 (patch) | |
| tree | b8542c15784ecb74ca84b20ef2813fddd1643a6e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 4fb39dbdaac7983ce1962b7f6c14353630ecf933 (diff) | |
| parent | e97d2b1c55ad240db3f2b46c2b5849ecd2236c18 (diff) | |
am e97d2b1c: (-s ours) am 9f46f1be: (-s ours) am 5eed30f3: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'e97d2b1c55ad240db3f2b46c2b5849ecd2236c18':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions