tree a51904ea03c8a893aa16fcfe5f17e98686501251
parent 2e5fea882c62bbcb2feff46ff935f2c9459ddf0d
parent 14e236dc9c59228f043326f9420b9715451927de
author Bill Yi <byi@google.com> 1588747637 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1588747637 +0000

[automerger skipped] Import translations. DO NOT MERGE am: 5b738924e3 -s ours am: 14e236dc9c -s ours

am skip reason: subject contains skip directive

Change-Id: Ibc3a8f96672cc5048bba79d39b29d52ca94cd13f