Jean-Baptiste Queru 7c2b7a5d41 am aff90790: am 4280891d: Merge "The bigger touch slop still has a problem" ... * commit 'aff90790dff94eb9a4bed541eff4f106623afd09': The bigger touch slop still has a problem		2012-02-22 10:01:01 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)	2012-01-19 14:45:03 -08:00
include	DO NOT MERGE	2012-02-13 15:21:04 -08:00
libs	Rename LOG_ASSERT to ALOG_ASSERT	2012-01-19 14:45:08 -08:00
opengl	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)	2012-01-19 14:45:03 -08:00
services/surfaceflinger	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)	2012-01-19 14:45:03 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00