commit 8bb6ea5995a30df8fb94bbfa041094a5f224321c
author Scott Main <smain@google.com> Wed Oct 26 13:16:13 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Oct 26 13:16:13 2011 -0700
tree 8876fc533f870c574a0fc82244016b46de83ebd5
parent 07767a9e748fdbdab2297974ad01cb265e7fb5a9
parent 360240097a7c1614e555d817695b623cfd5d8333

Merge "docs: add new style for adding "deprecated" messages to dev guides" into ics-mr0

target/product/core.mk

diff --git a/target/product/core.mk b/target/product/core.mk
index ca5858f..d45ea17 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -43,7 +43,7 @@
     TelephonyProvider \
     TtsService \
     UserDictionaryProvider \
-    VpnServices \
+    VpnDialogs \
     apache-xml \
     bluetooth-health \
     bouncycastle \

target/product/generic_no_telephony.mk

diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index a1cce72..416ab25 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -43,8 +43,7 @@
     SystemUI \
     Updater \
     CalendarProvider \
-    SyncProvider \
-    VpnDialogs
+    SyncProvider
 
 PRODUCT_PACKAGES += \
     icu.dat