tree 82f5c35817a7317ce66a48db6524868c6481f150
parent b64fb3429666ebf6d950df759d5754861325e64d
parent 28d5f8ee15082927a9ff60c66bda831a7139f6e3
author Bill Yi <byi@google.com> 1559763334 -0700
committer android-build-merger <android-build-merger@google.com> 1559763334 -0700

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

Change-Id: I7a2efc0b181c441ce4e19b5c3fb127671bdb4972