tree 480c44649893bec5b30252b8cda14b0d951ac7db
parent e0d5992c70fb91b44f8e14b6eb570dcd15feea90
parent d261f80c30882c940dd59b5471024065163d2305
author Bill Yi <byi@google.com> 1584646923 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584646923 +0000

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

am skip reason: subject contains skip directive

Change-Id: Id9c8e87b1a657493d975d89834d09e62b182be26