commit e44a3e05f24faeb63858dfae6b3af20359b72e67
author Chia-chi Yeh <chiachi@android.com> Fri Oct 21 16:45:29 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Oct 21 16:45:29 2011 -0700
tree 6c428da019aa22032143cba713398cc87712dbaa
parent a3d53ceba402f735f5fcd7ca42f17ea33fb45150
parent c8d742a1191c1da80c2ad211a53a40faaa891588

Merge "Move VpnDialogs into core.mk."

target/product/core.mk

diff --git a/target/product/core.mk b/target/product/core.mk
index aac703e..0f298ac 100644
--- a/target/product/core.mk
+++ b/target/product/core.mk
@@ -41,6 +41,7 @@
     SharedStorageBackup \
     TelephonyProvider \
     UserDictionaryProvider \
+    VpnDialogs \
     apache-xml \
     bouncycastle \
     bu \

target/product/generic_no_telephony.mk

diff --git a/target/product/generic_no_telephony.mk b/target/product/generic_no_telephony.mk
index d165b0f..0d87fc3 100644
--- a/target/product/generic_no_telephony.mk
+++ b/target/product/generic_no_telephony.mk
@@ -43,7 +43,6 @@
     Updater \
     CalendarProvider \
     SyncProvider \
-    VpnDialogs \
     bluetooth-health \
     hostapd \
     wpa_supplicant.conf