From: Bill Yi <byi@google.com>
Date: Thu, 10 Nov 2016 14:43:49 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e231af6c88  -s ours
X-Git-Tag: android-x86-8.1-r1~2121^2~1845
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=35e837a2f5d3ddb299a2a159d3586a737a3f5287;p=android-x86%2Fframeworks-base.git

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: e231af6c88  -s ours
am: 0006905319  -s ours

Change-Id: Ibdf03fc0e8582ef252ee5c922b206685de2b9829
---

35e837a2f5d3ddb299a2a159d3586a737a3f5287