diff options
author | Bill Yi <byi@google.com> | 2017-08-01 16:03:13 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-01 16:03:13 +0000 |
commit | bdd6289ad32cd1574940ec1be9679d25849264c6 (patch) | |
tree | f1f489cbfb320f8c512ba1aa3273b09e28ba071a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 3a26d3d3079f237672da0cbdb0a6b2807a6abc8c (diff) | |
parent | 672af292c47103258c469c9be6b3d12438215853 (diff) |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 040c26f636 -s ours am: 8d2fceae4a -s ours" into oc-mr1-dev-plus-aosp
am: 672af292c4 -s ours
Change-Id: I804502bb2709e6d37b3afa798c3b7c5002017fb0
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions