tree 0f9de2937a607a9da09b4091b9e4304338bf6298
parent 847cc98a4de5b1ecfd0f6428dc750f2f2bf2ddb4
parent 59b9b3af0b1b84d28bb65887254ab6c993c8b824
author Bill Yi <byi@google.com> 1560613942 -0700
committer android-build-merger <android-build-merger@google.com> 1560613942 -0700

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

Change-Id: Ibd127ae9a52c22a6e8739811b8b49fb546224e28