tree f908df9b29030560105fc7030f499ef64e82d1b5
parent dec987d3da106d158d599a40456fb33f7134e4e2
parent 9681eef5ff179980ae0d1c5437894f34ea7cfe87
author Bill Yi <byi@google.com> 1557026102 -0700
committer android-build-merger <android-build-merger@google.com> 1557026102 -0700

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

Change-Id: Ifa001d4bfc18d81cf3da5b85d12fcccdf542a206