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