From: Baligh Uddin <baligh@google.com>
Date: Fri, 25 Jul 2014 17:05:27 +0000 (+0000)
Subject: am 036400b3: (-s ours) am 21b8cb69: (-s ours) Import translations. DO NOT MERGE
X-Git-Tag: android-x86-6.0-r3~823
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=49f43bdadb06bc666253f949c667644a742edc26;p=android-x86%2Fpackages-apps-Camera2.git

am 036400b3: (-s ours) am 21b8cb69: (-s ours) Import translations. DO NOT MERGE

* commit '036400b3389a8f5707ce7ce14138cbf65f891e4b':
  Import translations. DO NOT MERGE
---

49f43bdadb06bc666253f949c667644a742edc26