tree 32d8055ae093d8c9a5e8a6201264fe4fe1c6f977
parent acfb403fae65f406f42a129d303c9ef03769e31c
parent 7c41b6341dba3166399dd5dbec4516037b6251aa
author Bill Yi <byi@google.com> 1550780809 -0800
committer android-build-merger <android-build-merger@google.com> 1550780809 -0800

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: af3625b9e5 -s ours
am: 7c41b6341d -s ours
am skip reason: subject contains skip directive

Change-Id: Id77cc2323c1f255cd9652c7997e1c867b9e5915b