tree 9ee88f6c390a006a989fd9eceea48fef0d14b234
parent 28a1c15d04f88700f9015169415c5d8650235a36
parent 939062daf456141e0233dc2bd718d09bc50df007
author Bill Yi <byi@google.com> 1523891424 -0700
committer android-build-merger <android-build-merger@google.com> 1523891424 -0700

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

Change-Id: I6a3739a14c41fc91a9831fd413cb44989dbd7f49