diff options
author | Bill Yi <byi@google.com> | 2016-06-16 10:03:22 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-16 10:03:22 +0000 |
commit | 206ac49f44c34fc42fa0e76ef5a9ef0c7f6e215e (patch) | |
tree | f600a700a723368b495094007267a629368cef8f /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 39aa6dc11ffd49abe13bef1e341e12e8ff7cfa86 (diff) | |
parent | 5ed24ad6c3948b265c89c263d9e7f34db8cbde60 (diff) |
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 5ed24ad6c3 -s ours
Change-Id: I782614166a75a36f637de928b66d527b68413e69
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions