tree 2ac7e942a9d6401b4132f938ec41a9a857647d62
parent 5c7f0c40fbf83064091f823d100bf969b163ade8
parent 236da59677827a9d7c616229bd73e5392025a935
author Bill Yi <byi@google.com> 1541900807 -0800
committer android-build-merger <android-build-merger@google.com> 1541900807 -0800

[automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0
am: 236da59677  -s ours

Change-Id: I8f2cce17bfcec29b146a46343cded42d1afd99de