tree 0ac0f84688a2faadb1226149dcbe572c4a9ab6a4
parent 95033aca4874fc4fbbee9921d020a008b13bf307
parent 4acf712d63f714a12694b91fbbb40fe061e0d784
author Bill Yi <byi@google.com> 1523988372 -0700
committer android-build-merger <android-build-merger@google.com> 1523988372 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 4acf712d63  -s ours

Change-Id: Ic257df5d5d42bc35ff3b1ff9f74716255de0f08a