diff options
author | Bill Yi <byi@google.com> | 2019-06-29 12:49:01 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-29 12:49:01 -0700 |
commit | a0c00cf032261607cc02fcf682d89193c8e95f77 (patch) | |
tree | bf61c71d2c1d830aa19d0485a66fcca2ca3ca308 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 535a6f9ddf999aaa61f95823d79fdfb9dca1ec86 (diff) | |
parent | 4b5e5899ce5073ea3d63aa3a3e9914fcfba59277 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 5e0da71b78 -s ours am: 6147626728 -s ours
am: 4b5e5899ce -s ours
am skip reason: subject contains skip directive
Change-Id: Id0eac84146894f514697ac959b9a6dbdfa638c15
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions