commit 6a9d68e24785c946a5b74c066dc1d7a1798aac3b
author The Android Automerger <android-build@google.com> Mon Sep 09 06:00:45 2013 -0700
committer The Android Automerger <android-build@google.com> Mon Sep 09 06:00:45 2013 -0700
tree 4ab5a2b11ecd2724cd57aed08bbccea0e24a67a6
parent 8c17006cf32df269cc3345b46af1f670f748dd25
parent 7c7fe38a8367b96082a01f4bbdef951e019d2a14

merge in klp-release history after reset to klp-dev

bluetooth/bdroid_buildcfg.h

diff --git a/bluetooth/bdroid_buildcfg.h b/bluetooth/bdroid_buildcfg.h
index b8d0dc7..8557fdd 100644
--- a/bluetooth/bdroid_buildcfg.h
+++ b/bluetooth/bdroid_buildcfg.h
@@ -25,7 +25,7 @@
 #define BTA_DM_COD {0x1A, 0x01, 0x0C}
 
 #define BTIF_HF_SERVICES (BTA_HSP_SERVICE_MASK)
-#define BTIF_HF_SERVICE_NAMES  { BTIF_HSAG_SERVICE_NAME }
+#define BTIF_HF_SERVICE_NAMES  { BTIF_HSAG_SERVICE_NAME, NULL }
 #define PAN_NAP_DISABLED TRUE
 #define BLE_INCLUDED FALSE
 #define BTA_GATT_INCLUDED FALSE

init.manta.rc

diff --git a/init.manta.rc b/init.manta.rc
index 61eb12e..b7d28d7 100644
--- a/init.manta.rc
+++ b/init.manta.rc
@@ -17,10 +17,10 @@
     symlink /storage/emulated/legacy /storage/sdcard0
     symlink /mnt/shell/emulated/0 /storage/emulated/legacy
 
-# Configure and enable KSM
+# KSM
     write /sys/kernel/mm/ksm/pages_to_scan 100
     write /sys/kernel/mm/ksm/sleep_millisecs 500
-    write /sys/kernel/mm/ksm/run 1
+#    write /sys/kernel/mm/ksm/run 1
 
 on post-fs-data
     mkdir /data/media 0770 media_rw media_rw

kernel

diff --git a/kernel b/kernel
index 25b546f..df1936b 100644
--- a/kernel
+++ b/kernel
Binary files differ