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

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

Change-Id: I7fbd39eeaaba27b93ef40201096fcd09bd176700
---

6528998efcd66cb542584893ced52468c992b9d4