Jean-Baptiste Queru 3dd0b85008 am 9e3d9575: Merge "stagefright aacenc: Add prototypes for arm specific implementations of functions" ... * commit '9e3d957599c76ba19e23fd25b75ccc02d54efe3e': stagefright aacenc: Add prototypes for arm specific implementations of functions		2012-02-27 13:07:43 -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	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