commit 0112d84839b4a1e359ba687caff20495f4820307
author The Android Automerger <android-build@google.com> Tue Sep 17 21:10:49 2013 -0700
committer The Android Automerger <android-build@google.com> Tue Sep 17 21:10:49 2013 -0700
tree 3a419ea042e1f8c15c0e615b042b3fdf4a0e3878
parent 22b85cc1144b0710a611ac8e0568b73fe3a52368
parent d7b480ae7cf8edd2689ad777a6015aaf417bad4e

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

core/build_id.mk

diff --git a/core/build_id.mk b/core/build_id.mk
index 6f949f5..a3b9db6 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,6 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-export BUILD_ID=KRS78C
+BUILD_ID := KLP
+
+DISPLAY_BUILD_NUMBER := true

target/product/base.mk

diff --git a/target/product/base.mk b/target/product/base.mk
index 988902b..c8f4354 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -49,6 +49,7 @@
     libiprouteutil \
     libjni_latinime \
     libjnigraphics \
+    libldnhncr \
     libmedia \
     libmedia_jni \
     libmediaplayerservice \

target/product/generic_no_telephony.mk

diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index d737e70..1155b4e 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -43,11 +43,11 @@
     Settings \
     SystemUI \
     TeleService \
-    Terminal \
     CalendarProvider \
     bluetooth-health \
     hostapd \
-    wpa_supplicant.conf
+    wpa_supplicant.conf \
+    WallpaperCropper
 
 PRODUCT_PACKAGES += \
     audio \