diff options
author | Bill Yi <byi@google.com> | 2019-06-01 08:10:27 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-01 08:10:27 -0700 |
commit | 6e7cb7c968cfbabe79829219badfda5e154f9797 (patch) | |
tree | fefbadbf9f76394b92c3ec6d372aa4183a2b6894 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c1c3be259f20ead5e09af1cf2b03097c9ae05ada (diff) | |
parent | ed07f7764db1d69b7581dd7e3e141d77d1619508 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 9070e5ab3a -s ours
am: ed07f7764d -s ours
am skip reason: subject contains skip directive
Change-Id: I6c3aead8ee16c5585c1a34bc3b5e743b06973c38
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions