From: Geoff Mendal <mendal@google.com>
Date: Thu, 27 Aug 2015 11:19:28 +0000 (+0000)
Subject: am 89c7b1a4: (-s ours) am 822b0367: (-s ours) am 51a59c80: (-s ours) am a94d0f6f... 
X-Git-Tag: android-x86-7.1-r1~25^2~9
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=00c17b877ae7eab891b43319acf606e08b9064a8;p=android-x86%2Fpackages-apps-Camera2.git

am 89c7b1a4: (-s ours) am 822b0367: (-s ours) am 51a59c80: (-s ours) am a94d0f6f: (-s ours) Import translations. DO NOT MERGE

* commit '89c7b1a4f17281ba925216f9313ca1bef96cdf31':
---

00c17b877ae7eab891b43319acf606e08b9064a8