Jean-Baptiste Queru 9364b5c01e am 4cd2b343: am 98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe" ... * commit '4cd2b343272429adae1fc68e0ec0628c69e88e6d': stagefright amrwbenc: Make the mem_malloc function 64-bit safe		2012-01-24 15:15:36 -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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00