From: Bill Yi <byi@google.com>
Date: Thu, 20 Oct 2016 16:11:52 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 3623134476  -s ours
X-Git-Tag: android-x86-8.1-r1~2121^2~2113
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b56b616c1a75c392e3e07aee07e9cfdb919d5653;p=android-x86%2Fframeworks-base.git

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 3623134476  -s ours
am: f9ca194dbe  -s ours

Change-Id: I40b3ca138f9514314b94a4748ebbbbc74bf848e5
---

b56b616c1a75c392e3e07aee07e9cfdb919d5653