tree b791882e6df5ee535f5245332667f5e3975dc090
parent 3b06a7cb258dcdc2493088ca0bc59f64b3989db9
parent 03c02527526fc98a862470ca2344111e1d4b7a56
author Bill Yi <byi@google.com> 1561521860 -0700
committer android-build-merger <android-build-merger@google.com> 1561521860 -0700

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

Change-Id: I2c467e88b0af22d9a5c220c94559b59e084c4caa