tree a65cd079bf95c1b2c974179f431b980e068b1e30
parent 39a9ebe5c53026006fc777739ba25b067eb417a8
parent f2678d3bc168e84713fb5ff83408f938ade91a65
author Bill Yi <byi@google.com> 1580180905 -0800
committer android-build-merger <android-build-merger@google.com> 1580180905 -0800

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

Change-Id: I0e0c522bc7dd2c6ac74bc2ae6e6b2269c01282ba