tree 3e76dc559a3fee222bc6bcec085c52f876a448a6
parent 9871fd3a086123ed143c90814e216595b22a6f1b
parent 0dc58cc4ee79b1cac5268c6cde403beb67a09997
author Bill Yi <byi@google.com> 1559764519 -0700
committer android-build-merger <android-build-merger@google.com> 1559764519 -0700

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

Change-Id: I7c7012998f1b311f38dc0ff96c74521d0a87b6d2