From: Bill Yi <byi@google.com>
Date: Sat, 3 Jun 2017 21:41:24 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into oc-dev
X-Git-Tag: android-x86-9.0-r1~3069^2~60
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=77e6256bb9;p=android-x86%2Fframeworks-base.git

Merge "Import translations. DO NOT MERGE" into oc-dev
am: f31a663316  -s ours

Change-Id: I349a8b805ab94428e62bcc5080771a1b675e0bcc
---

77e6256bb9fc6a4736dca85fd086b848574a0e2d