From: Bill Yi <byi@google.com>
Date: Fri, 5 Aug 2016 18:37:50 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e  -s ours am... 
X-Git-Tag: android-x86-8.1-r1~30
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=1748e12cf4a03b7040187e9f9db6023874f98543;p=android-x86%2Fpackages-apps-Gallery2.git

Merge "Import translations. DO NOT MERGE" into nyc-dev am: aa97eb008e  -s ours am: 86ce04b6e0  -s ours am: 10d2fa1ab5  -s ours
am: c32f5a7828  -s ours

Change-Id: Icba6165b4f29f4945b17b9dc694ddff877054555
---

1748e12cf4a03b7040187e9f9db6023874f98543