tree 9f4388951b549511f2b150472ec3ca09f1702dc8
parent e2c21704ebcce1857fc2188ac379199f1d64f08c
parent e72b993b912b61f53bdb00d5e36b346016887e8b
author Bill Yi <byi@google.com> 1570817543 -0700
committer android-build-merger <android-build-merger@google.com> 1570817543 -0700

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

Change-Id: I3a5a43d20969a1cef2170edc3be725aa9efb9a4d