diff options
author | Bill Yi <byi@google.com> | 2019-06-29 22:50:37 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-29 22:50:37 -0700 |
commit | e4034a3a328c4fba9e7ea478ad170d164ddb7d48 (patch) | |
tree | 070d1fbf85b1652fdedb7ad8c516f4993e9c4f65 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 3b35c00ff793b8ee7824e5d7067d261c5b034720 (diff) | |
parent | 3fe67d7abe02f8a3b804359711ffa007b31eda73 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: f4861b7199 -s ours
am: 3fe67d7abe -s ours
am skip reason: subject contains skip directive
Change-Id: I80aa147a639daac6ef05e681d25587d08988a0c6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions