Jeff Sharkey 4d08dbc61a Merge "Move away from deprecated NetworkInfo extra."		2012-01-30 11:53:32 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE	2012-01-08 13:19:13 +00:00
include	Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.	2012-01-25 15:14:50 -08:00
libs	SurfaceTexture: use fence sync on omap4 & s5pc110	2012-01-22 15:51:41 -08:00
opengl	Merge "gltrace: Use Unix Domain Socket rather than INET Socket"	2012-01-30 09:08:27 -08:00
services/surfaceflinger	remove unneeded code	2012-01-29 23:11:06 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00