tree 2fcbb3397326f63e1de26f34a041fc14a9674b56
parent 2330adabac0f69d6e2a444629a71e39f104d6467
parent 5a1b1a1b79ca16af7c3e73cab951c349dd8c539d
author Bill Yi <byi@google.com> 1555109798 -0700
committer android-build-merger <android-build-merger@google.com> 1555109798 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE"
am: 5a1b1a1b79 -s ours
am skip reason: subject contains skip directive

Change-Id: I686bc08b8f6fd2757442bd4d5489eee0c80db498