tree 2bcda746f3cf288c4ee1dde06096d2d8ca2905c0
parent e1a256ebe31549d04413a8f226bb58ff6fd6bc68
parent 172bc2accb79cab941903d32af3a9fc97039effa
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583802322 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1583802322 +0000

[automerger skipped] Import translations. DO NOT MERGE am: 172bc2accb -s ours
am skip reason: subject contains skip directive

Change-Id: Id97068ed1f5707fe8eeb29bf71ebc5e77015a217