tree c791e84620f5e463518eff90258ce0d4c01aced1
parent 0cffedbb1cab5b4a2d6ed151ab29fb7ee11ee86c
parent b291bb2f1f27d5ef00d8944d3a37a96b3a3f2c36
author Bill Yi <byi@google.com> 1542137969 -0800
committer android-build-merger <android-build-merger@google.com> 1542137969 -0800

[automerger skipped] Import translations. DO NOT MERGE skipped: aa2d5f7f4c skipped: 693a6388cf
am: b291bb2f1f  -s ours

Change-Id: I139cc4d105cafc03e803d50759da63ed0166f1c9