diff options
author | Bill Yi <byi@google.com> | 2016-06-24 06:02:39 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-06-24 06:02:39 +0000 |
commit | 0e7117ad0c8a1a64adb1484c625eca870988ef8b (patch) | |
tree | f06837098ea0de2139c6ccb4a96463ded1595a08 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 764e9808cdc71b5f43af11d5cc2aa6faffe6d1a2 (diff) | |
parent | 17b41e14bca540a6e858b5d986bf20ef3fcbef37 (diff) |
Merge \\"Import translations. DO NOT MERGE\\" into nyc-mr1-dev am: 97da29c710 -s ours
am: 17b41e14bc -s ours
Change-Id: Icdf24fc5f962b4e3ddf806dd3c5ffcbeea3ce3b4
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions