tree 706afdb1e8581857a903b05e17756b478359c0ed
parent 790e02ac339b0adb9ab1afb69cbcf79fba9dfdb8
parent a18d19b5d66b5dd5eb9e6a12890bdbca83d56fdc
author Bill Yi <byi@google.com> 1530865819 -0700
committer android-build-merger <android-build-merger@google.com> 1530865819 -0700

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

Change-Id: I69242979534bd2ebf69a58e6987e7c3eef9bef52