Fabrice Di Meglio 90b3f113a8 Merge "Fix bug #5753006 Garbled Labels in Maps"		2012-01-05 15:18:52 -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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00