From: Baligh Uddin <baligh@google.com>
Date: Sat, 7 Jun 2014 04:30:07 +0000 (+0000)
Subject: am f5e1977e: (-s ours) am 8979bf79: (-s ours) Merge "Import translations. DO NOT... 
X-Git-Tag: android-x86-6.0-r3~915
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b2c34cfc415cf56e9a706f339794892535011d43;p=android-x86%2Fpackages-apps-Camera2.git

am f5e1977e: (-s ours) am 8979bf79: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades

* commit 'f5e1977e04c7367cdfb675635ab1b5f67eefc81d':
  Import translations. DO NOT MERGE
---

b2c34cfc415cf56e9a706f339794892535011d43