From: Geoff Mendal <mendal@google.com>
Date: Mon, 25 Nov 2013 21:11:21 +0000 (-0800)
Subject: am 3e44cad5: (-s ours) am adf70222: (-s ours) Import translations. DO NOT MERGE
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~159^2~23^2~1
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=a08365d6;p=android-x86%2Fpackages-apps-Camera2.git

am 3e44cad5: (-s ours) am adf70222: (-s ours) Import translations. DO NOT MERGE

* commit '3e44cad56c566a40f2b8e78ae6a22bc9980dcca2':
  Import translations. DO NOT MERGE
---

a08365d61aa05e68fb6ea5afc24704d6efc4f0cf