From: Bill Yi <byi@google.com>
Date: Wed, 26 Jul 2017 23:09:07 +0000 (+0000)
Subject: Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125  -s... 
X-Git-Tag: android-x86-9.0-r1~411^2^2~5^2~26
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=45f115afadcf0272fbe78c3c6263042d8747dd46;p=android-x86%2Fframeworks-base.git

Merge "Merge "Import translations. DO NOT MERGE" into cw-f-dev am: fbfd283125  -s ours" into nyc-mr2-dev am: cd955ca6e5  -s ours
am: f66ddc099a  -s ours

Change-Id: Ia6630c6dd3cf9daf78fd3f07ebdc7515c548a3bd
---

45f115afadcf0272fbe78c3c6263042d8747dd46