Steve Block de1ee07cae Merge "Clarify comments for WebSettings."		2012-02-09 03:04:49 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE	2012-01-08 13:19:13 +00:00
include	Preliminary support for clipRect(Rect, Op)	2012-02-07 17:04:34 -08:00
libs	Merge "Preliminary support for clipRect(Rect, Op)"	2012-02-07 17:07:00 -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