diff options
author | Bill Yi <byi@google.com> | 2016-09-29 07:40:39 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-09-29 07:40:39 +0000 |
commit | 331cc3956321b2acf58b6d29ab82d78a85485de6 (patch) | |
tree | 4f96a97a1e18849169858159ddb46f6bfc0a9ddc /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 3024df77720ef44fd832794a1f4dfc7784ad3fea (diff) | |
parent | 4f6d64ea0d857b7259c09e748b80f5224ada819b (diff) |
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 4f6d64ea0d -s ours
Change-Id: I8c75997247b73ca0c6856f5ba14587f1da01638f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions