Jean-Baptiste Queru 4bbb0664c0 am 1a864db7: Merge "stagefright aacenc: Simplify the definition of __inline" ... * commit '1a864db7723a7947b72d24e6008ba48341d0feff': stagefright aacenc: Simplify the definition of __inline		2012-02-27 13:07:30 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)	2012-01-19 14:45:03 -08:00
include	Xcode 4.3 compatibility checkin	2012-02-19 08:31:19 +00: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