Xavier Ducrohet e167f532b6 am 3d4db0dc: am c205a9d6: am f8aea993: Make aapt ignore tools-related data. ... * commit '3d4db0dc1803252b924076f7d10d8e806af71824': Make aapt ignore tools-related data.		2012-02-06 11:44:43 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE	2012-01-08 13:19:13 +00:00
include	Merge "Multi-user - 1st major checkin"	2012-02-03 12:04:40 -08:00
libs	Merge "Multi-user - 1st major checkin"	2012-02-03 12:04:40 -08:00
opengl	fix a dead-lock in eglMakeCurrent	2012-02-03 15:24:51 -08:00
services/surfaceflinger	fix a crasher when starting SF with the screen off	2012-02-05 02:15:28 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00