From: Baligh Uddin Date: Sat, 5 Oct 2013 16:37:02 +0000 (-0700) Subject: am bf33451e: (-s ours) Merge "Build broken Revert "Import translations. DO NOT MERGE... X-Git-Tag: android-x86-6.0-r3~68^2~28^2~159^2~171 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6137316b;p=android-x86%2Fpackages-apps-Camera2.git am bf33451e: (-s ours) Merge "Build broken Revert "Import translations. DO NOT MERGE"" into klp-ub-dev * commit 'bf33451ece2d872aa5dfc770a694a4f57432698b': Build broken Revert "Import translations. DO NOT MERGE" --- 6137316bb6e5b727a63ff4505828d3334aa8d4b7