commit e2c150d15bc3011059a6715c3850da01691eede5
author The Android Automerger <android-build@google.com> Thu Aug 08 07:53:12 2013 -0700
committer The Android Automerger <android-build@google.com> Thu Aug 08 07:53:12 2013 -0700
tree 35614778245397d87d243becdc766dbf35a2e94e
parent 2a516ccce5b58515191cd0b55da9df6e4838589e
parent 1c64e0cfe7563adfd7993cf3ead9123025bd2bcd

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 adaa795..715d72c 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -18,4 +18,4 @@
 # (like "CRB01").  It must be a single word, and is
 # capitalized by convention.
 
-export BUILD_ID=KRS38B
+export BUILD_ID=KRS39B

target/product/base.mk

diff --git a/target/product/base.mk b/target/product/base.mk
index 846f69e..25df921 100644
--- a/target/product/base.mk
+++ b/target/product/base.mk
@@ -57,6 +57,7 @@
     libmtp \
     libnetlink \
     libnetutils \
+    libpac \
     libreference-ril \
     libreverbwrapper \
     libril \
@@ -86,6 +87,7 @@
     ndc \
     netcfg \
     netd \
+    pacserver \
     ping \
     ping6 \
     platform.xml \

target/product/core.mk

diff --git a/target/product/core.mk b/target/product/core.mk
index 0776892..ddbc2ac 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -27,6 +27,7 @@
     ExternalStorageProvider \
     KeyChain \
     PicoTts \
+    ProxyHandler \
     SharedStorageBackup \
     VpnDialogs