Tsu Chiang Chuang 22e1920a70 am 08eb7dd6: Merge "extending timeout to stabilize tests" into ics-mr1 ... * commit '08eb7dd630a2de8dd51a988a747da26ff9d3f8fb': extending timeout to stabilize tests		2012-02-13 13:43:07 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)	2012-01-19 14:45:03 -08:00
include	Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)	2012-01-19 14:44:56 -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	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