tree 6d94f7072a097a8ed700480ede4be7fa8608e5a4
parent 2c503dfb0cacd0e72355e8c3f94a9fcf0d9edecb
parent 2f9282d478ae7ebe927bdc4bca787990dc809907
author Bill Yi <byi@google.com> 1533393451 -0700
committer android-build-merger <android-build-merger@google.com> 1533393451 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 6b16bed46b  -s ours am: 4fe22dec49  -s ours
am: 2f9282d478  -s ours

Change-Id: Ifba7a3e513378921bdc7d19e57ee794a3f407acf