merge in klp-dev history after reset to master
diff --git a/core/build_id.mk b/core/build_id.mk
index 6628d43..40bb35d 100644
--- a/core/build_id.mk
+++ b/core/build_id.mk
@@ -1,4 +1,4 @@
-
+#
# Copyright (C) 2008 The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,11 +13,20 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
+#
+# Defines branch-specific values.
+#
+
# BUILD_ID is usually used to specify the branch name
# (like "MAIN") or a branch name and a release candidate
-# (like "CRB01"). It must be a single word, and is
+# (like "TC1-RC5"). It must be a single word, and is
# capitalized by convention.
+#
+BUILD_ID := MASTER
-BUILD_ID := KLP
-
+# DISPLAY_BUILD_NUMBER should only be set for development branches,
+# If set, the BUILD_NUMBER (cl) is appended to the BUILD_ID for
+# a more descriptive BUILD_ID_DISPLAY, otherwise BUILD_ID_DISPLAY
+# is the same as BUILD_ID
DISPLAY_BUILD_NUMBER := true
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 \
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