tree e180c31163995151997d954577eb25754ef987b1
parent 60601985342258728c6f06ae962a6f003b3e62ab
parent 1c99d77a3697e490fbf2bc2219cb7f59125a4a41
author Bill Yi <byi@google.com> 1566616117 -0700
committer android-build-merger <android-build-merger@google.com> 1566616117 -0700

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

Change-Id: I3d6e4749aeae39286b21e7fb6021c84cc16c40d2