tree fe73f6078df71c542639a610c45701f5552b3160
parent f3dc2c86996b88c8e67d961a062be072664166f4
parent 7af5bede6d6e1148d988d298a4b20336357b0266
author Bill Yi <byi@google.com> 1564176998 -0700
committer android-build-merger <android-build-merger@google.com> 1564176998 -0700

[automerger skipped] Import translations. DO NOT MERGE
am: 7af5bede6d -s ours
am skip reason: subject contains skip directive

Change-Id: I102e589b1187deffc7a9dc809f8f089084fc9ebe