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