From: Bill Yi <byi@google.com>
Date: Thu, 16 Feb 2017 15:32:32 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
X-Git-Tag: android-x86-8.1-r1~2121^2~251
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fframeworks-base.git;a=commitdiff_plain;h=2b8164620fdc18a8b7bba5854c64d6fc62e308a1

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: ea62e92c27  -s ours

Change-Id: I0cde2e97d2d4ed8659b06ecae96c57a32f501e09
---

2b8164620fdc18a8b7bba5854c64d6fc62e308a1