tree 94c6c3a8e3b1b178ebe6c1525c98f748ae003031
parent 1199aac873f08a56d85a360e35bf89d33b94902f
parent b0720ae3c087f7bae8693f27445aa82cf7d1265d
author Bill Yi <byi@google.com> 1538380062 -0700
committer android-build-merger <android-build-merger@google.com> 1538380062 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: f6e12d6972 skipped: f487edc7f2 am: 2053a11236  -s ours am: ed50f647f7  -s ours
am: b0720ae3c0  -s ours

Change-Id: Ibb60f477d5e4338807999cd42bfe87e0dfd6c95d