Jeff Sharkey 6815727eb7 Merge "Avoid NDC deadlock when re-arming network alert."		2012-02-02 13:19:37 -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	gltrace: fixup Push & Insert Marker calls	2012-02-01 12:16:40 -08:00
services/surfaceflinger	Merge "fix an issue with vsync event delivery"	2012-01-31 16:46:27 -08:00
MODULE_LICENSE_APACHE2
NOTICE