diff options
author | Bill Yi <byi@google.com> | 2016-06-09 14:22:05 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-09 14:22:05 +0000 |
commit | 9d89f2ed0d9bc0efb1244fbe52b490aae4d5b8f7 (patch) | |
tree | c166b15f59c4e19cb0c5412b9a9be2743a9750e6 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 1ac84113c62c67c70f550458543b0e62a44e7a31 (diff) | |
parent | 972b902171687b887d4c50b926a519503c95beb8 (diff) |
Merge \"Import translations. DO NOT MERGE\" into nyc-dev
am: 972b902171 -s ours
Change-Id: Ibcecebeb1286ecbc1529b428028a75c5b01de436
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions