tree c25fbb3bb93cc49306bd03e660f3e4b3b8bb090e
parent fc58a495d6b80443a4fc0c96c876f8211e192a3d
parent 7288a72ef623e03cff01f411529d7b7656dcef5f
author Bill Yi <byi@google.com> 1541193919 -0700
committer android-build-merger <android-build-merger@google.com> 1541193919 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 7288a72ef6  -s ours

Change-Id: Ifd1ae1d2a54f95e2ad308e88c24d51db0305e7e7