merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
diff --git a/device.mk b/device.mk
index 77d6a1a..683bce3 100644
--- a/device.mk
+++ b/device.mk
@@ -222,6 +222,9 @@
 	libwfcu \
 	conn_init
 
+PRODUCT_PACKAGES += \
+	keystore.msm8960
+
 PRODUCT_DEFAULT_PROPERTY_OVERRIDES += \
 	rild.libpath=/system/lib/libril-qc-qmi-1.so