tree 9dd0348e9bd0df3d48212e0c2b869011c433e0ed
parent a18d19b5d66b5dd5eb9e6a12890bdbca83d56fdc
parent 5fa34341de221e46e236a1610d6ab13a93de645c
author Bill Yi <byi@google.com> 1538286007 -0700
committer android-build-merger <android-build-merger@google.com> 1538286007 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: 7461bd2d22 skipped: 6f8022f76a am: 6d150a29de  -s ours
am: 5fa34341de  -s ours

Change-Id: I279dd9f3e14483b1db3bbe8fd4bfb756243805be