tree c791e84620f5e463518eff90258ce0d4c01aced1
parent 0e9f6c0928e3868035a16779102d79b4992759b9
parent 6d150a29debe6dfb5ad1e88f87f63b38d2678671
author Bill Yi <byi@google.com> 1538285586 -0700
committer android-build-merger <android-build-merger@google.com> 1538285586 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: 7461bd2d22 skipped: 6f8022f76a
am: 6d150a29de  -s ours

Change-Id: I9accfc8e81d260f21823cfc2441d453f9ccab484