tree 8a53c01c21fc31dd846f4e7fe2a274ca7d7da2b7
parent 70eb1b936a05a56204f2e8f86a69720b6946e3fc
parent b5bd00b8094b001d286cffc511cd562eb0f18f71
author Bill Yi <byi@google.com> 1524892214 -0700
committer android-build-merger <android-build-merger@google.com> 1524892214 -0700

[automerger skipped] Import translations. DO NOT MERGE am: cf69168837  -s ours
am: b5bd00b809  -s ours

Change-Id: I5fef15381ce965557e449c9fc8bb586279d61b1f