tree 838985e56af38b5c0bd0f9e52a484e99483df9d6
parent 2c386153dd28c0e69a4b9aefaffab8e7116f2775
parent 51e3a842dce4a9be70872681d07f8c999db24ea4
author Bill Yi <byi@google.com> 1541517236 -0800
committer android-build-merger <android-build-merger@google.com> 1541517236 -0800

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

Change-Id: Iaac6f747d425d3448770023b8aa07db6d95e9d19