Merge from open-source master

Change-Id: Id74236b5a2b2717bbe45c684573106555c7d9ad2
This commit is contained in:
Jean-Baptiste Queru
2011-01-31 15:14:41 -08:00

View File

@@ -246,6 +246,7 @@ GRANDFATHERED_USER_MODULES += \
libGLES_android \ libGLES_android \
libGLESv1_CM \ libGLESv1_CM \
libGLESv2 \ libGLESv2 \
libglib \
libglib_static \ libglib_static \
libgui \ libgui \
libhardware \ libhardware \
@@ -408,6 +409,7 @@ GRANDFATHERED_USER_MODULES += \
ndc \ ndc \
netcfg \ netcfg \
netd \ netd \
network \
ninepatch \ ninepatch \
oauth \ oauth \
obbtool \ obbtool \