diff options
author | Bill Yi <byi@google.com> | 2019-06-20 09:24:06 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-20 09:24:06 -0700 |
commit | 0680ec46e50a4242fb217167247cfcd23d1f6a09 (patch) | |
tree | 675a04dbe6be2d4f1509b1a7a7356d3521fbb155 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 29aad14ad8165c408a477c902f02f49d7bba4e68 (diff) | |
parent | bd0f30ab958b5d55ed8532695f8520aa48d80986 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: e288f13f25 -s ours
am: bd0f30ab95 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib424246b0675c31f42759c013158e9a154f87310
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions