commit 0bb8688de493cf29cc2faa7dbb5ca200c3e1ceaa
author The Android Automerger <android-build@android.com> Mon Mar 12 06:59:09 2012 -0700
committer The Android Automerger <android-build@android.com> Mon Mar 12 06:59:09 2012 -0700
tree 56502a27d4fb5b2347e52bec0bbf32a840e2d245
parent a37d7bfcb6cbd6ce6ee7c856fcc12e689576f49a
parent 346dcd98859c1504619be34f515c9044430333fe

merge in jb-release history after reset to master

full_wingray.mk

diff --git a/full_wingray.mk b/full_wingray.mk
index 771f4b2..b8f1d8f 100644
--- a/full_wingray.mk
+++ b/full_wingray.mk
@@ -25,10 +25,6 @@
 	LiveWallpapersPicker \
 	VisualizationWallpapers
 
-# Camera
-PRODUCT_PACKAGES += \
-    Camera
-
 # Inherit from those products. Most specific first.
 $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 # This is where we'd set a backup provider if we had one

kernel

diff --git a/kernel b/kernel
index 69bd42d..5ae06ef 100644
--- a/kernel
+++ b/kernel
Binary files differ