tree 9dd0348e9bd0df3d48212e0c2b869011c433e0ed
parent bc96cc193459703f83b599f24a9465cede44b2c5
parent 0e9f6c0928e3868035a16779102d79b4992759b9
author Bill Yi <byi@google.com> 1530861891 -0700
committer android-build-merger <android-build-merger@google.com> 1530861891 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: ed887297b9 skipped: 594624f336 am: a9ef860b83  -s ours
am: 0e9f6c0928  -s ours

Change-Id: Ib5b7491931d6178bd5dfe7eb3844754d2a84bb7d