tree 95fda543f4675ae6ecf3d3f9762ba546bf2e3046
parent 8019f6443df04473ffae7ce010b062b5f6cfd2d5
parent b84ad0d8f8f6a59432826a2da559a9f1ec5d1abf
author Bill Yi <byi@google.com> 1585173460 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1585173460 +0000

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

am skip reason: subject contains skip directive

Change-Id: I8bdbe317c5b1f562f905aa4c4bacb408a49dfb9d