diff options
author | Bill Yi <byi@google.com> | 2017-07-26 08:33:51 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-26 08:33:51 +0000 |
commit | cd126286ed7c36ec7901ea3f1a299ddcb63a509f (patch) | |
tree | 2268ab4e8b606824b5b19b7835a46d5759b9689a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 586abb8c03e6bf20645b662cc4ea0783d7581dc1 (diff) | |
parent | eb5a73f4eccbcf4f70ae23c32a41e21a7483533f (diff) |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186 -s ours am: 0ad45f6f76 -s ours" into oc-dr1-dev-plus-aosp
am: eb5a73f4ec -s ours
Change-Id: I48e9216bc9bf710e0fc0483d80b62387da1191df
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions