diff options
| author | Baligh Uddin <baligh@google.com> | 2015-09-25 18:58:39 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-09-25 18:58:39 +0000 |
| commit | 1ace12cb47235309ad4569b23f79c92433ba08b4 (patch) | |
| tree | 2573efb0c6cc4acb58ff5179ffa43c6408e82d4b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | fc832e3ef270d7c271520a99ffa2f84e82f0b855 (diff) | |
| parent | 2b3f2f45098dad06f0044a6e5a1a83f71ed89018 (diff) | |
am 2b3f2f45: (-s ours) am fdfd01be: (-s ours) am 683db030: (-s ours) am 9b1c6f77: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
* commit '2b3f2f45098dad06f0044a6e5a1a83f71ed89018':
Import translations. DO NOT MERGE
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions