tree 702dde763dc0ed8c587eed630be4774c7f4a4f59
parent b609f42819bc3356cec9d6f87a2c11934d5ade10
parent 751ffa4da9278a487a372b03e3694185a30d9e45
author Bill Yi <byi@google.com> 1550348160 -0800
committer android-build-merger <android-build-merger@google.com> 1550348160 -0800

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

Change-Id: Ie839512de2fa151ee41c4e5346568ef89b29050f