From: Bill Yi <byi@google.com>
Date: Mon, 21 Nov 2016 01:44:32 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: d0220f7863 ... 
X-Git-Tag: android-x86-8.1-r1~2121^2~1729
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=17191218520eaf8dc2a717ae73d07bd1ad9d6fe4;p=android-x86%2Fframeworks-base.git

Merge "Import translations. DO NOT MERGE" into stage-aosp-master am: d0220f7863  -s ours
am: 610d943dd6  -s ours

Change-Id: I32cb631e3fc22caaad64403f3a13852b0d9ec18e
---

17191218520eaf8dc2a717ae73d07bd1ad9d6fe4