Kenny Root eb051e35e9 resolved conflicts for merge of e80341c8 to master ... Change-Id: I5d2150e20aebb6aba10caa391268c0fdbbf281ef		2012-01-13 13:39:28 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE	2012-01-08 13:19:13 +00:00
include	remove dead/usnused code	2012-01-11 22:03:41 -08:00
libs	remove dead/usnused code	2012-01-11 22:03:41 -08:00
opengl	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE	2012-01-08 13:19:13 +00:00
services/surfaceflinger	fix a bug with vsync management	2012-01-12 16:13:54 -08:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00