diff options
author | Bill Yi <byi@google.com> | 2019-06-29 12:25:59 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-29 12:25:59 -0700 |
commit | a6d9bffb6345b281a4de95c7b3748d5adac3ebb0 (patch) | |
tree | 04788e4fd417f5e75d2ba81314b7e81c151e4045 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | f57a060afc89b89873d938ede3b679af1355b50c (diff) | |
parent | 5e0da71b78b84dcc4ef76c5cf40699ab17485f4f (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 5e0da71b78 -s ours
am skip reason: subject contains skip directive
Change-Id: I3f61ddafc544e090c8cdf468c143c2470891c728
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions