tree 869fa6a4f9fdb2f1cc0d67a228a078da02388f70
parent 0dc58cc4ee79b1cac5268c6cde403beb67a09997
parent 90b3dabe5c9b2bfd72a5372d5fddbee15e4112b1
author Bill Yi <byi@google.com> 1560476783 -0700
committer android-build-merger <android-build-merger@google.com> 1560476783 -0700

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

Change-Id: I43828b21453537b2f568b25be3684608922b9786