diff options
| author | Bill Yi <byi@google.com> | 2016-06-09 17:24:31 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-06-09 17:24:31 +0000 |
| commit | 2112824b4080b3b125f1739d617e712501d1013d (patch) | |
| tree | 30f7c4c3e7e17d77c99fa49145ea9b9c48df5c01 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a3d4c84311e9bd03c5813f7512a48922986ec99c (diff) | |
| parent | 71856b14d2f4e6f54e030964b5c82262a34bb534 (diff) | |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 3bbeae9ddd -s ours
am: 71856b14d2 -s ours
Change-Id: I44af41f9e993bbd6bb010f2d7faef264491a5d6d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions