tree 95fda543f4675ae6ecf3d3f9762ba546bf2e3046
parent e94bed9a0c5de410639397b7a7797e4cff251ca4
parent 609c18fa9caa5804f336223cc54ebb05299c154c
author Bill Yi <byi@google.com> 1585173384 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585173384 +0000

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

am skip reason: subject contains skip directive

Change-Id: I8445077fdd45eeef080c10e72ccd07fa233d2663