From: Geoff Mendal <mendal@google.com>
Date: Mon, 13 Jul 2015 23:00:23 +0000 (+0000)
Subject: am 5d806912: (-s ours) am e27c079d: (-s ours) Import translations. DO NOT MERGE
X-Git-Tag: android-x86-6.0-r3~24
X-Git-Url: http://git.osdn.net/view?p=android-x86%2Fpackages-apps-Camera2.git;a=commitdiff_plain;h=a06a903fa4f414bd5a1aa0c6061a5b46b7739013

am 5d806912: (-s ours) am e27c079d: (-s ours) Import translations. DO NOT MERGE

* commit '5d806912451dd81453aac72c9b7b2fa53e4f6096':
  Import translations. DO NOT MERGE
---

a06a903fa4f414bd5a1aa0c6061a5b46b7739013