From: Geoff Mendal <mendal@google.com>
Date: Mon, 13 Jul 2015 23:37:34 +0000 (+0000)
Subject: am c3b7039c: (-s ours) am f3eb023d: (-s ours) am 50f8944c: (-s ours) am 1ac1ac74... 
X-Git-Tag: android-x86-7.1-r1~25^2^2~20^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f962ec00;p=android-x86%2Fpackages-apps-Camera2.git

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

* commit 'c3b7039c31eea15b1e45471ce1fac1f336a47ad5':
  Import translations. DO NOT MERGE
---

f962ec00095ce774a5db134df1c19aa116d2e9ad