Joe Fernandez 875401d5be am 53c0d46d: am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1 ... * commit '53c0d46d85a651093382a92466b0b0658ef1920c': docs: NDK overview, remove x86 instruction set mention (b/6044027)		2012-02-23 14:28:07 -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