tree 5b5ef1581858350a400cc8f286d39ff4dd592c88
parent fe5af7781ee1609967b77970ec5b46b44ea7ba6f
parent 7bb552c49e68a6d0809011ab9e11a5d20a8889ca
author Bill Yi <byi@google.com> 1546042037 -0800
committer android-build-merger <android-build-merger@google.com> 1546042037 -0800

[automerger skipped] Import translations. DO NOT MERGE
am: 7bb552c49e  -s ours

Change-Id: I9d7aaa757f21343d5ae6cfec4fb2783113fa597b