tree 621e4dfc6fb9db2cdba70b57a37321ae084a56a4
parent f489540430ee5cfca24a306f709438c2dc24d120
parent 3eac3e9daacfff9f68437d9014e514af862f4da1
author Bill Yi <byi@google.com> 1587195497 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1587195497 +0000

[automerger skipped] Import translations. DO NOT MERGE am: 9b06717b11 -s ours am: 3eac3e9daa -s ours

am skip reason: subject contains skip directive

Change-Id: I81142de25eeb0c6d8059f07ba478116d2f213c49