tree 78e8ee465b54097a93aa844f124ad073c4fb3a61
parent 24790aa3c89b90299cfc6d5cb9016d6642198108
parent 638b36f6283b8b88c452f9132e97a0da711adaec
author Bill Yi <byi@google.com> 1568849708 -0700
committer android-build-merger <android-build-merger@google.com> 1568849708 -0700

[automerger skipped] Import translations. DO NOT MERGE am: d6feab9fca -s ours
am: 638b36f628 -s ours
am skip reason: subject contains skip directive

Change-Id: I01b9bdb1cee0f13cddee3692eaa386f43192cc6b