diff options
author | Android Build Merger (Role) <noreply-android-build-merger@google.com> | 2019-06-24 15:48:20 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2019-06-24 15:48:20 +0000 |
commit | 18c98d52b6e12191e80ecd806a44159f72b7818d (patch) | |
tree | 0b78bebe76ee6aa49a4d0a242ae926e93dcee449 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 12258e0a314691f652ac9ee857b5cdb5cab9a594 (diff) | |
parent | e3943cdd296e68f1b28f7774f712f402b107bc5f (diff) |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 4ffaa9a225 -s ours am: a9cd5d94f3 -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions