tree 723bf52398e0212734fd2be0b9609a1e40dcbc1c
parent 12c49a014f224ffd9f5db2c55647532511640370
parent 870edbbd0b4ca7e3fe373399db3b39b423de62dc
author Bill Yi <byi@google.com> 1589040448 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1589040448 +0000

[automerger skipped] Import translations. DO NOT MERGE am: ab08793f52 -s ours am: 0ac5edb2c4 -s ours am: 870edbbd0b -s ours

am skip reason: subject contains skip directive

Change-Id: I6499d55ad4faa5c08ab59b9e24d9afb5f72700d7