diff options
author | Bill Yi <byi@google.com> | 2016-07-12 16:38:11 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 16:38:11 +0000 |
commit | cbdecf95fd1dbc61e55b9e39b3c39fd68c3ad8f4 (patch) | |
tree | 91e17e014c1eea8130a2ab018470c09fe3753e2d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 61d0e73419f7686b47b037deaa849518ecbc31f5 (diff) | |
parent | f25fae7ea516b7812eb788c23963cd98c3565539 (diff) |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-dev am: 84c67fa304 -s ours
am: f25fae7ea5 -s ours
Change-Id: I83d520d76aa9e4a285fc8b67cb14f7cb4e107fd6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions