Dianne Hackborn da2e9896ee am c221d6ec: am 27e20ccd: Merge "Fix issue #6073913: onActivityResult() not getting called..." into ics-mr1 ... * commit 'c221d6ec2fbaa73f82cd219e2d5ab078697070ab':		2012-02-28 15:16:20 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)	2012-01-19 14:45:03 -08:00
include	Add stubs for better compatibility	2012-02-27 08:54:57 -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