From: Baligh Uddin <baligh@google.com>
Date: Sun, 22 May 2016 23:10:21 +0000 (+0000)
Subject: Merge "Import translations. DO NOT MERGE am: 69e900b5dc  -s ours am: 7cf69c9b91 ... 
X-Git-Tag: android-x86-8.1-r1~91
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=15a0e7eeffc05a7ac356e541b3bd0a64f7142cb8;p=android-x86%2Fpackages-apps-Camera2.git

Merge "Import translations. DO NOT MERGE am: 69e900b5dc  -s ours am: 7cf69c9b91  -s ours" into nyc-mr1-dev-plus-aosp
am: cd4f238305  -s ours

* commit 'cd4f2383056383854edc6e79b447910f4f935a24':

Change-Id: Id75c4a4fd9296353800761e2287e9ddc4e9b85e1
---

15a0e7eeffc05a7ac356e541b3bd0a64f7142cb8