tree e077ca9d13ef86a2589c42e576e40efcc40415f8
parent eef01b7b80c244455c5b0758d342da407d460ba5
parent 47ea8eb8fde784b11be9d2e4e1912db814f82c25
author Bill Yi <byi@google.com> 1568850621 -0700
committer android-build-merger <android-build-merger@google.com> 1568850621 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 885dfb7134 -s ours am: a7fd1427da -s ours am: 92a95bc537 -s ours
am: 47ea8eb8fd -s ours
am skip reason: subject contains skip directive

Change-Id: I103091d6efae8934b46a5fca7d3fe2d9fac0ee8f