diff options
author | Bill Yi <byi@google.com> | 2019-06-24 08:45:40 -0700 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2019-06-24 08:45:40 -0700 |
commit | 75f383fa25159b03ed823decbfc1a66eade9e78d (patch) | |
tree | 0b78bebe76ee6aa49a4d0a242ae926e93dcee449 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | c9f3d2d6fef7da5a19799205f6bd79f8d878b7af (diff) | |
parent | 453efcb333fa7d3ad0aa994407d2075fd5e0847a (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c000487154 -s ours
am: 453efcb333 -s ours
am skip reason: subject contains skip directive
Change-Id: I4fc34749c532d0d261089b697e87267fadb16765
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions