From: Android Build Merger (Role) <noreply-android-build-merger@google.com>
Date: Thu, 25 Jan 2018 23:17:31 +0000 (+0000)
Subject: [automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am:... 
X-Git-Tag: android-x86-9.0-r1~241^2~2^2~33
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ece99d6601;p=android-x86%2Fframeworks-base.git

[automerger skipped] Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1d77757fb5  -s ours skipped: d855899adb am: 350fc5d06a  -s ours am: 02ee278871  -s ours
am: 1e9b3172bc  -s ours

Change-Id: Idd53800a33435dcff27f6bc904349560dea039cd
---

ece99d6601bcdc89773319eaca6541e5bfe85be0