From: Geoff Mendal <mendal@google.com>
Date: Thu, 27 Aug 2015 11:19:10 +0000 (+0000)
Subject: am b919d6a9: (-s ours) am f3eb023d: (-s ours) am 50f8944c: (-s ours) am 1ac1ac74... 
X-Git-Tag: android-x86-7.1-r1~25^2~23
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=02102ece;p=android-x86%2Fpackages-apps-Camera2.git

am b919d6a9: (-s ours) am f3eb023d: (-s ours) am 50f8944c: (-s ours) am 1ac1ac74: (-s ours) Import translations. DO NOT MERGE

* commit 'b919d6a9d009444168493fc05d3178e54f79556a':
---

02102ece08c08cce8a4d551dd1c84837c400d56d