tree 9f4388951b549511f2b150472ec3ca09f1702dc8
parent bb9d555305570d7a9ddd1b0dfd53e4ee8d7077b9
parent 3b4c1522189c93a6dab11542c8cc9678168e5a7e
author Bill Yi <byi@google.com> 1570817565 -0700
committer android-build-merger <android-build-merger@google.com> 1570817565 -0700

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

Change-Id: I2d99bb4269806a217a23c9c212888c725ba75c39