tree c847efab1745bfdac53942ffbf044bdcc5fa4249
parent 018bf3ac4638c323861853f3a40147b735f149f5
parent 8e91e78e178e4b5daca37b9098ebef64208add0d
author Bill Yi <byi@google.com> 1523891792 -0700
committer android-build-merger <android-build-merger@google.com> 1523891792 -0700

[automerger skipped] Import translations. DO NOT MERGE skipped: 00778af10c skipped: 6640be8865 am: f8331e668b  -s ours am: 939062daf4  -s ours
am: 8e91e78e17  -s ours

Change-Id: I16254b6911f1153a1d3112de8bbda8fb49676113