diff options
author | Bill Yi <byi@google.com> | 2017-07-20 10:20:11 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-07-20 10:20:11 +0000 |
commit | ef44c49c8820721090611c49ce25b84a94c4d805 (patch) | |
tree | 02a0e042e1e2e002ed79fd16512450c069dfb74d /tools/aapt2/java/JavaClassGenerator.cpp | |
parent | 878a13ed9bcaaa02dd29bada2b279ddcad9ce9a2 (diff) | |
parent | f9a0de0fa3566111a1c506967f14a768246ea624 (diff) |
Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 6564d7d123 -s ours am: dfd75c536f -s ours" into oc-mr1-dev-plus-aosp
am: f9a0de0fa3 -s ours
Change-Id: Ic5cd6d5dde1610e7b17750b914826944a48c5f6f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions