diff options
author | Bill Yi <byi@google.com> | 2019-06-01 09:41:18 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-01 09:41:18 -0700 |
commit | fbd5663237decb9bad8f308f0a71fec95c0d0951 (patch) | |
tree | fefbadbf9f76394b92c3ec6d372aa4183a2b6894 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 23922410c3432686cd80dfb0d50ac80397495226 (diff) | |
parent | da0d1ae77922242eda867bda2e1d0e93825917c5 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: da0d1ae779 -s ours
am skip reason: subject contains skip directive
Change-Id: Ie8ce77d34b8710bad13e3303029f894f5ac83658
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions