diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-19 02:49:07 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-19 02:49:07 +0000 |
| commit | d159a208a4f1dbec522d8a0a5045a96fbe6d0082 (patch) | |
| tree | e4b097e9d0a3e8adb2c93d006c582d8e1c7a7722 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 08b004233537f625044b3f01e2923b600a9aa77c (diff) | |
| parent | a64c3e57baeec6f3b7ce70d098a81c3b33dc5f55 (diff) | |
am a64c3e57: (-s ours) am ce992f1b: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit 'a64c3e57baeec6f3b7ce70d098a81c3b33dc5f55':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions