tree 95fda543f4675ae6ecf3d3f9762ba546bf2e3046
parent 67012670f8d44b730d26ea5f9863b71eda23f5cb
parent c054f231ae94ff14fc1cebe632d98597a153c884
author Bill Yi <byi@google.com> 1585171525 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585171525 +0000

[automerger skipped] Import translations. DO NOT MERGE am: c054f231ae -s ours

am skip reason: subject contains skip directive

Change-Id: I0350f17bd8488903fd4971d0b9fc58b4a941f7b2