diff options
author | Bill Yi <byi@google.com> | 2016-07-12 16:44:00 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 16:44:00 +0000 |
commit | 1fcb281351be98cd79da6aa9910da86e439cb1bd (patch) | |
tree | 91e17e014c1eea8130a2ab018470c09fe3753e2d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 1ef588bdc596573436e562c90b3239d31644f096 (diff) | |
parent | 8d06bbf201604d60ffed6fdbc7ef78beb69aff12 (diff) |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: a2e1bb8c3e -s ours
am: 8d06bbf201 -s ours
Change-Id: I36cfe7b2c938cf8bb8d22fc65c9d25e04197d61d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions