From: Geoff Mendal <mendal@google.com>
Date: Sat, 11 Jul 2015 12:41:38 +0000 (+0000)
Subject: am 09364eeb: (-s ours) am b980a5be: (-s ours) Import translations. DO NOT MERGE
X-Git-Tag: android-x86-6.0-r3~6^2~15
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=57b4d24e779a10a6dccf4c5c841d1f43c2bc77fd;p=android-x86%2Fpackages-apps-Camera2.git

am 09364eeb: (-s ours) am b980a5be: (-s ours) Import translations. DO NOT MERGE

* commit '09364eebaa1c07801e5849b73c5163646b4ceb4d':
  Import translations. DO NOT MERGE
---

57b4d24e779a10a6dccf4c5c841d1f43c2bc77fd