From: Baligh Uddin <baligh@google.com>
Date: Tue, 30 Oct 2012 00:16:00 +0000 (-0700)
Subject: am 5428f346: (-s ours) am b1b8b9d8: am 5ac0bdab: (-s ours) Merge "Import translations... 
X-Git-Tag: android-x86-7.1-r1~458^2~743^2~288
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e5cb8a93a665fa2e15cff211f7ae3725e10c130d;p=android-x86%2Fpackages-apps-Gallery2.git

am 5428f346: (-s ours) am b1b8b9d8: am 5ac0bdab: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev

* commit '5428f3463dbf74873413bd2a8ed1199e78a4a0fe':
  Import translations. DO NOT MERGE
---

e5cb8a93a665fa2e15cff211f7ae3725e10c130d