diff options
| author | Bill Yi <byi@google.com> | 2019-06-24 09:17:22 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-06-24 09:17:22 -0700 |
| commit | 92c52204aeb6b6e085bd1e02752b7d7a4a5d6339 (patch) | |
| tree | 327813f3031b344a0b2c9348147e04e45434625e /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 549fd86271cff6b27f5d82bf789977f10a7b276a (diff) | |
| parent | 619b9befbbc5f1136af9b29d489134b641f781e8 (diff) | |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e0c262b7da -s ours am: 067f9816b1 -s ours
am: 619b9befbb -s ours
am skip reason: subject contains skip directive
Change-Id: I8331b39a6038a579c1e557c8d9c42bc8c0e283ed
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions