tree 7bc6309c1a82848031f33529c5fc91126f5caa52
parent f41f9e2f41d11a9b82238dbf5cc2d7c8dfab084b
parent 62f41b53686d3e70320a338b394d4491344e4069
author Bill Yi <byi@google.com> 1586548495 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1586548495 +0000

[automerger skipped] Import translations. DO NOT MERGE am: 500ed46d9e -s ours am: 62f41b5368 -s ours

am skip reason: subject contains skip directive

Change-Id: Ieaddc627633aadfa668ca79d8efb88a6880508bc