Jean-Baptiste Queru 28a907bd19 am db2b3930: (-s ours) am f3f650db: am a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)" ... * commit 'db2b39300a8f763cf2d0c9808deb86db87d5492c': Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)		2012-01-20 16:35:20 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE	2012-01-08 13:19:13 +00:00
include	Merge "Fix compilation with Clang."	2012-01-13 15:16:59 -08:00
libs	Get AID_GRAPHICS from right place	2012-01-13 13:45:39 -08:00
opengl	gltrace: fixup data for glTexSubImage2D & glDeleteBuffers	2012-01-17 12:28:11 -08:00
services/surfaceflinger	Get AID_GRAPHICS from right place	2012-01-13 13:45:39 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00