Jamie Gennis 493db47929 Merge "BufferQueue: add a setMaxAcquiredBufferCount check" into jb-mr1-dev		2012-09-04 14:58:51 -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 "BufferQueue: add a setMaxAcquiredBufferCount check" into jb-mr1-dev	2012-09-04 14:58:51 -07:00
libs	Merge "BufferQueue: add a setMaxAcquiredBufferCount check" into jb-mr1-dev	2012-09-04 14:58:51 -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	Merge "Add timeout when waiting for HW vsync" into jb-mr1-dev	2012-09-04 09:38:39 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00