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