diff options
author | Bill Yi <byi@google.com> | 2016-06-27 17:48:22 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-27 17:48:22 +0000 |
commit | 23f0ee01c98017ba302e9fbe60d385d11d741490 (patch) | |
tree | 2394f9f5f16ea909ce688727f6ec2f81b6591c05 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | d502a1469685d97c2ec09385934de3dc1acd23e8 (diff) | |
parent | 6ad70eaa60c8f4d4143078d29773d39ac9b03f74 (diff) |
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: 6ad70eaa60 -s ours
Change-Id: I364d21030fb62f1355e91d67459d418d69af5660
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions