diff options
author | Bill Yi <byi@google.com> | 2017-07-26 08:57:53 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-26 08:57:53 +0000 |
commit | c105d1ab91b0af630b052a7b06e1e5357731e602 (patch) | |
tree | e794a4f17ceace99ed933dcfbe865f8c3e43754a /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 73273fd881492ce8047b3fef875e7aacaa6f0100 (diff) | |
parent | f2f1c1bc867a0c4e0b54f324adc14404720812a1 (diff) |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: a7f60741ae -s ours am: 4d00a9512a -s ours am: a6eed85c8b -s ours" into oc-mr1-dev-plus-aosp
am: f2f1c1bc86 -s ours
Change-Id: I0141015f18d41299a4f87b4ff31aba2045e28b86
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions