tree 0d589f942ded5ca734691ba2939a3716457c8859
parent 7e82134093d0d46f00265c8bb649be5f52a90d36
parent 9b25ccdb41642e84dbcb8863cd9ab3ea5473b691
author Bill Yi <byi@google.com> 1584647299 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584647299 +0000

[automerger skipped] Import translations. DO NOT MERGE am: e19a23a7ff -s ours am: 9b25ccdb41 -s ours

am skip reason: subject contains skip directive

Change-Id: Ice41350cb89ae2e06f3fd5045681686e8ccbdd5e