tree b153507f5a489ef30943f01cd8056fa5b5bb6ffa
parent e681626afa733746ba432557609de6aed67e95d9
parent 22f595b2c59c432aba619ab2dc67c37f3e70dfb8
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584459288 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 1584459288 +0000

[automerger skipped] Import translations. DO NOT MERGE am: 2f6ed0524e -s ours am: 22f595b2c5 -s ours

am skip reason: subject contains skip directive

Change-Id: Ibc2e02b9a444eb64fafda11bee4711c4638c93ac