Joe Fernandez 39c1418277 am 6a9beb53: am 835e07f8: Merge "docs: Android NDK r7b Release Notes" into ics-mr1 ... * commit '6a9beb536f13c4df178cbe67c74c30d258bef28f':		2012-02-14 13:06:16 -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