tree 10af9927aa932913c124ceb948c3458ff6cc717a
parent b5a6fc267767497d5df4708a1246d108414f7951
parent 33e684bc573bab1fc54d4c2e4747ac92531ab4ac
author Bill Yi <byi@google.com> 1567484936 -0700
committer android-build-merger <android-build-merger@google.com> 1567484936 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: d3700eff44 -s ours
am: 33e684bc57 -s ours
am skip reason: subject contains skip directive

Change-Id: I066efa4be58f01d30c43991cedf571bc2ef86ab9