tree 3432ecf17cece477c8f5736feb6c9b40e1038e1d
parent 0b619db6ff354fe2320a19c561515a5d734f5416
parent 75166c84266bba4b25d53319911bba196af72c9f
author Bill Yi <byi@google.com> 1571970029 -0700
committer android-build-merger <android-build-merger@google.com> 1571970029 -0700

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

Change-Id: Ib2be9e25bb8973b57a619a5a0d3038cb6598bd31