diff options
author | Bill Yi <byi@google.com> | 2019-08-07 16:40:43 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-08-07 16:40:43 -0700 |
commit | 68063af9e9f3a83775a86f33e4c6e360ea6094ea (patch) | |
tree | 30bc1b1d57c8d6d088d8a67d602d67061789f51b /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 7263ff5efd4a26d018e2ec0b36835e97cd9e9a99 (diff) | |
parent | fc798ad2e3bfdbf7b090f5092501d357518d853a (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6aa3f38983 -s ours am: 1daf3587cb -s ours
am: fc798ad2e3 -s ours
am skip reason: subject contains skip directive
Change-Id: I83d9310ff1bfdbfe24d4741e2ed7b0c4a2772565
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions