The Android Open Source Project 2680b68cfc am 964faa35: am 3f3afbef: Reconcile with ics-mr1-release ... * commit '964faa351815a86cf6832f261e71daf48af3d5c6':		2012-02-01 10:06:19 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE	2012-01-08 13:19:13 +00:00
include	Merge "fix an issue with vsync event delivery"	2012-01-31 16:46:27 -08:00
libs	aapt now sorts the strings in the resource string pool.	2012-01-31 15:41:30 -08:00
opengl	fix a race condition in eglMakeCurrent()	2012-01-30 18:20:52 -08:00
services/surfaceflinger	Merge "fix an issue with vsync event delivery"	2012-01-31 16:46:27 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00