diff options
author | Bill Yi <byi@google.com> | 2016-07-12 16:27:27 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-12 16:27:27 +0000 |
commit | 7fb8c28f13a9e6d0002fed25e91e94be5209ef72 (patch) | |
tree | 2a55d672e714b4b5b9e30f47c4779adbca6ca660 /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 9575e75b9b80bf8d7a0434cd57acda4be007d70c (diff) | |
parent | fd3dc6d96ddfa1cc890cb2f4a4b5fef5c5c37aab (diff) |
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: fd3dc6d96d -s ours
Change-Id: I93a17573d5be751e02698e8731fd383b67db11a3
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions