tree 952b37c5992a0466e85325259fc58b07c220a84b
parent af1984944b2c54d19096ef844e24e2e4cefcab56
parent 95460d28f8757033181da4953e930dc7612deb09
author Bill Yi <byi@google.com> 1561477042 -0700
committer android-build-merger <android-build-merger@google.com> 1561477042 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: c760a652ab -s ours
am: 95460d28f8 -s ours
am skip reason: subject contains skip directive

Change-Id: I26af8d2c8caf94dc3a3dd3e2bbdd7170d0914a75