Merge "Build SlimFileManager" into jb4.2
diff --git a/overlay/sgs/frameworks/base/core/res/res/values/config.xml b/overlay/sgs/frameworks/base/core/res/res/values/config.xml
index c897713..a8459d2 100644
--- a/overlay/sgs/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/sgs/frameworks/base/core/res/res/values/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Disable the home key unlock setting -->
-    <bool name="config_disableHomeUnlockSetting">false</bool>
+    <!-- Disable the home key unlock setting
+    <bool name="config_disableHomeUnlockSetting">false</bool>-->
 </resources>
 
diff --git a/proprietary/hololauncherhd/HoloLauncherHD.apk b/proprietary/hololauncherhd/HoloLauncherHD.apk
index 31185d2..c0aa093 100644
--- a/proprietary/hololauncherhd/HoloLauncherHD.apk
+++ b/proprietary/hololauncherhd/HoloLauncherHD.apk
Binary files differ