diff options
author | Bill Yi <byi@google.com> | 2019-11-17 08:11:19 -0800 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-11-17 08:11:19 -0800 |
commit | 7cc4ae5afc598a6569be05cf8dfd1b724cb4a61d (patch) | |
tree | da7bdcc38002831aab93565d96ee9589800ba3ec /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | de2644264928a6fa85842f728e291c8ec3213b3f (diff) | |
parent | 64f417f0ae4336bfed56273cb21dfc163e18a387 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 64f417f0ae -s ours
am skip reason: subject contains skip directive
Change-Id: I5449b787f5bd1468b7ec423407a4c34338949bc1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions