From: Baligh Uddin <baligh@google.com>
Date: Tue, 16 Sep 2014 15:21:36 +0000 (+0000)
Subject: am a3a6c5b1: (-s ours) am 25361e3f: (-s ours) am 522466e6: (-s ours) am f2382657... 
X-Git-Tag: android-x86-6.0-r3~68^2~27^2~90
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=79e49fce885951bbe98bbae5067758153c7a2622;p=android-x86%2Fpackages-apps-Camera2.git

am a3a6c5b1: (-s ours) am 25361e3f: (-s ours) am 522466e6: (-s ours) am f2382657: (-s ours) am 0c5fc1d3: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-glacier

* commit 'a3a6c5b14225782b4e78505d31ebb163e61c8307':
---

79e49fce885951bbe98bbae5067758153c7a2622