From: Baligh Uddin <baligh@google.com>
Date: Fri, 5 Oct 2012 23:15:56 +0000 (-0700)
Subject: am d3ef8b1e: am e6b2212a: (-s ours) Merge "Import translations. DO NOT MERGE" into... 
X-Git-Tag: android-x86-6.0-r3~68^2~28^2~213^2~19^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2^2~428^2~2^2~13^2~80^2~2^2~516
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=af92cf3293938b5ac7acd2bfbc66ea6b5a984440;p=android-x86%2Fpackages-apps-Camera2.git

am d3ef8b1e: am e6b2212a: (-s ours) Merge "Import translations. DO NOT MERGE" into gb-ub-photos-arches

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

af92cf3293938b5ac7acd2bfbc66ea6b5a984440