Dianne Hackborn 1676828d11 Merge "Return information about whether overlays are disabled."		2012-02-07 13:46:46 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE	2012-01-08 13:19:13 +00:00
include	Merge "Multi-user - 1st major checkin"	2012-02-03 12:04:40 -08:00
libs	make sure to ignore SIGPIPE in the write side of BitTube	2012-02-06 19:17:56 -08:00
opengl	fix a dead-lock in eglMakeCurrent	2012-02-03 15:24:51 -08:00
services/surfaceflinger	Merge "Return information about whether overlays are disabled."	2012-02-07 13:46:46 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00