Scott Main a10be9c171 am 8f6b4c52: am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1 ... * commit '8f6b4c52ded03527d3c60e99cafa66aaabb4f355': docs: fix action bar style example		2012-02-01 11:58:57 -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	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