tree 3ed3f8b1f523f95232b88dca8b5a59d3175a054f
parent c131d69bde678905362cac23d50a2cb3d3faba28
parent 31bb57db5b0a7efc926659a79530474d20d2a32f
author Bill Yi <byi@google.com> 1570817867 -0700
committer android-build-merger <android-build-merger@google.com> 1570817867 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 76b2775eee -s ours am: 3b4c152218 -s ours
am: 31bb57db5b -s ours
am skip reason: subject contains skip directive

Change-Id: Ibd43c74b6da117af92ab6c208d6d3f9adb94bbd9