diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-25 03:11:34 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-25 03:11:34 +0000 |
| commit | b4f7abbdaedafd3ec1bed152d74f0bdfaa96f53c (patch) | |
| tree | d5d5f10451db52ce1dddf24887d0978e7684f43c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | c266a512cc4d4d844d152ad0ea8086966ee26dc9 (diff) | |
| parent | 56c2f8eefb7100ddc8850ccf744a7bc55e8d295d (diff) | |
am 56c2f8ee: (-s ours) am 4ee34138: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '56c2f8eefb7100ddc8850ccf744a7bc55e8d295d':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions