Teng-Hui Zhu 15f6b67fab Merge "getDuration can be only called after prepared."		2012-01-05 14:47:01 -08:00
cmds	Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE	2012-01-04 20:05:49 +00:00
include	Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE	2012-01-04 20:05:49 +00:00
libs	Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"	2012-01-05 14:07:02 -08:00
opengl	Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"	2012-01-05 14:07:02 -08:00
services/surfaceflinger	Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"	2012-01-05 14:07:02 -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