diff options
author | Bill Yi <byi@google.com> | 2019-06-29 12:42:14 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-29 12:42:14 -0700 |
commit | d8c0c9ea05d4798dc8c9adcdc3a3d0c52fb17fd3 (patch) | |
tree | 64b369ffb76aec49b75c89319a032dd2ac0474e3 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 4b5e5899ce5073ea3d63aa3a3e9914fcfba59277 (diff) | |
parent | a6d9bffb6345b281a4de95c7b3748d5adac3ebb0 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 5e0da71b78 -s ours
am: a6d9bffb63 -s ours
am skip reason: subject contains skip directive
Change-Id: Ia8d601df47f9c47eb4453e7b2d0959d806191a32
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions