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