diff options
author | Bill Yi <byi@google.com> | 2019-06-07 12:17:48 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-07 12:17:48 -0700 |
commit | a1d096a7f05eed973b16690097eca9e44b893ec8 (patch) | |
tree | b827bf243986e705df1be0922e8ac52ce153e08c /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | bb349cb2a2d7cda9321f05f35d12d7d42526256b (diff) | |
parent | d07bcd4b0da01c9fcc623a08ec69cd34802cdc97 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: d07bcd4b0d -s ours
am skip reason: subject contains skip directive
Change-Id: Ida895ee7f9cffe27c564346f620bb385f3c36c79
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions