tree c2e2d2e0daf31456ea557a934e9c3e18833b7e45
parent 638b36f6283b8b88c452f9132e97a0da711adaec
parent a7fd1427da05b0938162348ce6240fb7cae6f7fd
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: 885dfb7134 -s ours
am: a7fd1427da -s ours
am skip reason: subject contains skip directive

Change-Id: I6ed30b3b83de7cc7c018b8e4ef53f8012f34e43a