From: Baligh Uddin <baligh@google.com>
Date: Thu, 8 May 2014 14:52:16 +0000 (+0000)
Subject: am 7658b354: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everg... 
X-Git-Tag: android-x86-6.0-r3~1021
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=00f3f958ea23876d7542f56965ad7d8051638a2e;p=android-x86%2Fpackages-apps-Camera2.git

am 7658b354: (-s ours) Merge "Import translations. DO NOT MERGE" into ub-camera-everglades

* commit '7658b354a4172e137f13460e5910bf3101fb60ec':
  Import translations. DO NOT MERGE
---

00f3f958ea23876d7542f56965ad7d8051638a2e