Merge from open-source master

Change-Id: Id74236b5a2b2717bbe45c684573106555c7d9ad2
2011-01-31 15:14:41 -08:00
parent 2039512c30 00aef60ada
commit e29ef594e6
1 changed files with 2 additions and 0 deletions
--- a/core/user_tags.mk
+++ b/core/user_tags.mk
@@ -246,6 +246,7 @@ GRANDFATHERED_USER_MODULES += \
 	libGLES_android \
 	libGLESv1_CM \
 	libGLESv2 \
+	libglib \
 	libglib_static \
 	libgui \
 	libhardware \
@@ -408,6 +409,7 @@ GRANDFATHERED_USER_MODULES += \
 	ndc \
 	netcfg \
 	netd \
+	network \
 	ninepatch \
 	oauth \
 	obbtool \