tree d4c854364d678bd83b49a9cbe9d90552c96be68d
parent 2c164a79fdde5bafaab08f959e7a1355415e16a3
parent c7e65586f787655745489fee8f51c826957982a1
author Bill Yi <byi@google.com> 1533393222 -0700
committer android-build-merger <android-build-merger@google.com> 1533393222 -0700

[automerger skipped] Import translations. DO NOT MERGE am: 20ac5ce5cb  -s ours
am: c7e65586f7  -s ours

Change-Id: I64719c37d0d191018296d8ed73f64a531f9eb1b6