tree e5d93759aaabd0ace46651f3c125c9eec0ffcacc
parent f4531cd3c4de7dd97b642074c200b266b5bcc3fd
parent 4712246f85d51c354208fc318387aa4555e64c8e
author Bill Yi <byi@google.com> 1565576346 -0700
committer android-build-merger <android-build-merger@google.com> 1565576346 -0700

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

Change-Id: Iace10c1adc9040d704c9549e58a8f59f55d65afc