Scott Main 4630cb7804 resolved conflicts for merge of 20d06540 to master ... Change-Id: I80da9a11b4538c070b0000cfa3ea6cd865e46aef		2012-01-31 08:55:23 -08:00
cmds	Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF) DO NOT MERGE	2012-01-08 13:19:13 +00:00
include	Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc.	2012-01-25 15:14:50 -08:00
libs	SurfaceTexture: use fence sync on omap4 & s5pc110	2012-01-22 15:51:41 -08:00
opengl	fix a race condition in eglMakeCurrent()	2012-01-30 18:20:52 -08:00
services/surfaceflinger	SF now synchronizes to VSYNC	2012-01-30 15:21:23 -08:00
MODULE_LICENSE_APACHE2
NOTICE