tree 838985e56af38b5c0bd0f9e52a484e99483df9d6
parent e9b09f2bc81fab7f20cbd6772d8b171ba1db9167
parent 12c04b486d624afd94b3148d2f8ca8433d7790cc
author Bill Yi <byi@google.com> 1541517129 -0800
committer android-build-merger <android-build-merger@google.com> 1541517129 -0800

[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am: 12c04b486d  -s ours

Change-Id: I37b6cb41f86f485350a4d51a65758ac189eb7570