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

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

Change-Id: Ic152eac3a92179537cb18ce715c500a96d376923
---

acb237644c07eef292d3e597546589d46f19c0d2