diff options
author | Bill Yi <byi@google.com> | 2016-06-09 13:57:15 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-09 13:57:15 +0000 |
commit | 1ac84113c62c67c70f550458543b0e62a44e7a31 (patch) | |
tree | c166b15f59c4e19cb0c5412b9a9be2743a9750e6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 2c1aee92709afac26baea890b44f77dc1b4c85fd (diff) | |
parent | 648c1112a60df584c9d7e680a9a1284172a874db (diff) |
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 648c1112a6 -s ours
Change-Id: I495ab1285df32ffdbc39a03b6c2d94ccb8271622
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions