tree f5858da5164cb0e91a25718e75f022ceb289219d
parent 3648b88825c229182a437dcd810c11794f99c72b
parent fb2e738600108ddff47d9c60f904f7d15b659a2e
author Bill Yi <byi@google.com> 1540566359 -0700
committer android-build-merger <android-build-merger@google.com> 1540566359 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 52b3a450bc  -s ours
am: fb2e738600  -s ours

Change-Id: I098f0b11ea7012cc868c265958da726957dbb169