diff options
author | Bill Yi <byi@google.com> | 2019-08-06 23:22:21 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-06 23:22:21 -0700 |
commit | 673e5d6d21fbf9f264cf0795620a989048f030f6 (patch) | |
tree | 50a4e715a7b694074e27149b84a58eefd5b58c8d /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 6a1ec1b167a5cfbc0a2c05025cacf0b80023ba63 (diff) | |
parent | 4a28946f406aec82a4163799f3b8cde444ed0072 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6aa3f38983 -s ours am: 1daf3587cb -s ours
am: 4a28946f40 -s ours
am skip reason: subject contains skip directive
Change-Id: I0fe48aed1e86bd485daf803e85f5f9d30d5ae06c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions