From: Bill Yi <byi@google.com>
Date: Sat, 10 Jun 2017 06:13:36 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
X-Git-Tag: android-x86-9.0-r1~1030^2~1162
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8314ad1f25380213c273a4039d52ba98ef577bf1;p=android-x86%2Fframeworks-base.git

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

Change-Id: I8f92d3f9c8b15070a661cf0480268b7100ca33ec
---

8314ad1f25380213c273a4039d52ba98ef577bf1