tree a978b67d08cfb27fa9ea5252e0e924c9aafe8ca0
parent e60bbb5e290e9648734364b7cf71699ea47abe29
parent 6e9b71e1d712c89553d170c3e935557a1e6ba82c
author Bill Yi <byi@google.com> 1527208837 -0700
committer android-build-merger <android-build-merger@google.com> 1527208837 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 6e9b71e1d7  -s ours

Change-Id: Ia2dea698b25f0c180a3313b9f0cc58d00ffcdb6a