tree f5e1bfc6206bee570a483389fe6ed20b829ee966
parent a4204b3a803283b0ed680d3e52711336f702f0e2
parent a0b22da4e5b353c55cb41da4c53153aad2884bf2
author Bill Yi <byi@google.com> 1569421890 -0700
committer android-build-merger <android-build-merger@google.com> 1569421890 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: a0b22da4e5 -s ours
am skip reason: subject contains skip directive

Change-Id: I91a5e3bd8bb860d674715569ca5ebc95e4708e5f