tree 2e4d64dc7ad64a6f677677a220a345e5ffe0475f
parent ee2be9caaaabc99e4fdba272168b166c4ea9a9fa
parent f52b0bd3dfd214f7286191e420b9c05d31dafdb0
author Bill Yi <byi@google.com> 1561511678 -0700
committer android-build-merger <android-build-merger@google.com> 1561511678 -0700

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

Change-Id: Ieddf3ab5f63f6572eb23858a98f054e46753bf0e