tree fc2bab5645c9cab799b6b5fce4cf32f7f382996a
parent 95cf9b05e411a8b0236011f79cf44f0167b17593
parent 59346999ba6449ab37f96e92c1aa8bfd5ee13eaf
author Bill Yi <byi@google.com> 1584597673 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584597673 +0000

[automerger skipped] Import translations. DO NOT MERGE am: 59346999ba -s ours

am skip reason: subject contains skip directive

Change-Id: If55d9235a6bbda109258fe2ab8074d33e6ae573d