diff options
author | Bill Yi <byi@google.com> | 2019-06-24 09:12:38 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-24 09:12:38 -0700 |
commit | e69b008cf24a80b91421213ee36029a2c428ff34 (patch) | |
tree | 327813f3031b344a0b2c9348147e04e45434625e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f292afc14f14c3f1176d2e075bd10b7bcc3750ba (diff) | |
parent | 75f383fa25159b03ed823decbfc1a66eade9e78d (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c000487154 -s ours am: 453efcb333 -s ours
am: 75f383fa25 -s ours
am skip reason: subject contains skip directive
Change-Id: I098c9fe51ade0362c6767987ab08a5d6676d174a
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions