Jean-Baptiste Queru d3bbcaff6f resolved conflicts for merge of 21938749 to jb-mr1-dev ... Change-Id: I17da10797736f3772a143e2015fe25df0bb3eb3f		2012-08-20 10:22:33 -07:00
build	Dalvik heap size for a 10" xhdpi tablet.	2012-08-01 18:14:45 -07:00
cmds	add /d/sync to dumpstate	2012-08-08 15:32:02 -07:00
data/etc	Move com.nxp.mifare to frameworks/native.	2012-04-12 21:24:08 -07:00
include	Merge "SurfaceTexture: inherit from ConsumerBase" into jb-mr1-dev	2012-08-17 15:35:17 -07:00
libs	resolved conflicts for merge of 21938749 to jb-mr1-dev	2012-08-20 10:22:33 -07:00
opengl	am 6e820eec: am 6f89ebde: Merge "EGL: do not use sparse files for shader"	2012-08-20 09:42:32 -07:00
services	refactor compositing code to avoid multiple eglMakeCurrent() calls	2012-08-16 20:58:58 -07:00
MODULE_LICENSE_APACHE2
NOTICE