diff options
author | Bill Yi <byi@google.com> | 2017-08-01 16:00:58 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-08-01 16:00:58 +0000 |
commit | 3a26d3d3079f237672da0cbdb0a6b2807a6abc8c (patch) | |
tree | f1f489cbfb320f8c512ba1aa3273b09e28ba071a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 7fea8cfe5c862699c97d87896009f801e01820af (diff) | |
parent | db925ec4cddc5e5637f80a511d565a2f98089bd8 (diff) |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 040c26f636 -s ours am: 08674f3a25 -s ours" into oc-mr1-dev-plus-aosp
am: db925ec4cd -s ours
Change-Id: I7f35b4130090c0f2f8d0c093268ca5af7fcf7d37
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions