diff options
author | Bill Yi <byi@google.com> | 2016-07-21 04:06:17 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-07-21 04:06:17 +0000 |
commit | 63157a3b6e94e0817baab36dee304919aa92feb6 (patch) | |
tree | b3348af0e2af1937f4ec317971714c153f9836df /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d6803f7eec511b78cca12c12089c8351c80fb3b1 (diff) | |
parent | c3264b01ed1b15e75dc74041c76e57d40d9e20da (diff) |
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: c3264b01ed -s ours
Change-Id: Ia217a988e8816741bca4a04ba2a27c7e09eaf249
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions