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