tree 188246881ffc6935613de7c52510bc912e1e1c7f
parent 0a8a60d3d1bca822aff4d25e1e025f2eacfc274a
parent 867d31cfed925655dc00c5f4611eff204bb40ca3
author Bill Yi <byi@google.com> 1569715944 -0700
committer android-build-merger <android-build-merger@google.com> 1569715944 -0700

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

Change-Id: I85431a65bac9408c7a2499d449db6aedb6043f1d