diff options
author | Bill Yi <byi@google.com> | 2019-06-29 12:43:53 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-29 12:43:53 -0700 |
commit | 535a6f9ddf999aaa61f95823d79fdfb9dca1ec86 (patch) | |
tree | bf61c71d2c1d830aa19d0485a66fcca2ca3ca308 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | cb64a6273f379d3152d76117b69c5e1ea250b5e1 (diff) | |
parent | c04f152b27cf7c10790432aabe4727e1388d1979 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 680695de82 -s ours
am: c04f152b27 -s ours
am skip reason: subject contains skip directive
Change-Id: I45e46694050847fac68a8a6ad46ae0378f68c0ed
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions