tree 1b2711566c1fe6efa84a46c27dcc0337d5866104
parent f1ddc799410350a4590c189082c42e609e01865f
parent 92947cd4fb170ade9a64d5d7a3839e2c241a6f03
author Bill Yi <byi@google.com> 1524891964 -0700
committer android-build-merger <android-build-merger@google.com> 1524891964 -0700

[automerger skipped] Import translations. DO NOT MERGE am: c0a1b85fe9  -s ours
am: 92947cd4fb  -s ours

Change-Id: Idc3173fcafc9466a73dead3e9a07b5441edbbf25