tree fbb3f99bc2ec0f8f85efebc6ad3b3cb06a2651af
parent 67e8c15daff97ec0315f315a30c1d14da5d348b0
parent 21caa6f1d3c2f63a475bde83ec3dba79f2e51b8c
author Bill Yi <byi@google.com> 1558191505 -0700
committer android-build-merger <android-build-merger@google.com> 1558191505 -0700

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

Change-Id: Id888bed48ac77a605fe027e820a27e0cad2c32b5