Reconcile with jb-release - do not merge
Change-Id: I9328881b4ad7f1616c24abc040a9d7e702829a23
diff --git a/BoardConfig.mk b/BoardConfig.mk
index 7fa3d44..6df76b3 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -24,6 +24,7 @@
TARGET_CPU_ABI := armeabi-v7a
TARGET_CPU_ABI2 := armeabi
TARGET_CPU_SMP := true
+TARGET_ARCH := arm
TARGET_ARCH_VARIANT := armv7-a-neon
ARCH_ARM_HAVE_TLS_REGISTER := true
diff --git a/kernel b/kernel
index a84e8a9..a08cf49 100644
--- a/kernel
+++ b/kernel
Binary files differ
diff --git a/recovery/Android.mk b/recovery/Android.mk
index 770feee..72cd80e 100644
--- a/recovery/Android.mk
+++ b/recovery/Android.mk
@@ -1,4 +1,4 @@
-ifneq (,$(findstring $(TARGET_DEVICE),tuna toro torospr maguro))
+ifneq (,$(findstring $(TARGET_DEVICE),tuna toro toroplus maguro))
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
diff --git a/ueventd.tuna.rc b/ueventd.tuna.rc
index 23cd5ab..00a8e37 100644
--- a/ueventd.tuna.rc
+++ b/ueventd.tuna.rc
@@ -44,3 +44,6 @@
/dev/modem_br 0660 radio radio
/dev/cdma_ramdump0 0660 radio radio
/dev/lte_ramdump0 0660 radio radio
+
+#for cp log
+/dev/cdma_cplog 0660 radio radio