From: Baligh Uddin <baligh@google.com>
Date: Fri, 19 Sep 2014 23:51:26 +0000 (+0000)
Subject: am 0f175802: (-s ours) am 78cb750d: (-s ours) am 8399a0c5: (-s ours) am 67bcd21a... 
X-Git-Tag: android-x86-6.0-r3~68^2~26^2~92
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=fd575faad8b03125484f50e255ba553dc0c88db1;p=android-x86%2Fpackages-apps-Camera2.git

am 0f175802: (-s ours) am 78cb750d: (-s ours) am 8399a0c5: (-s ours) am 67bcd21a: (-s ours) am 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

* commit '0f1758028c8d962cf524a9b273836ec19ca038e9':
  Import translations. DO NOT MERGE
---

fd575faad8b03125484f50e255ba553dc0c88db1