The Android Automerger 6e9dc4c814 merge in jb-mr1-release history after reset to jb-mr1-dev		2012-08-22 06:33:48 -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	ui/Fence: change the TIMEOUT_NEVER value to -1	2012-08-21 19:07:30 -07:00
libs	Merge "Add BufferItemConsumer, a simple BufferQueue consumer." into jb-mr1-dev	2012-08-21 16:46:05 -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	Added display initialization method	2012-08-21 13:11:51 -07:00
MODULE_LICENSE_APACHE2	auto import from //depot/cupcake/@135843	2009-03-03 19:31:44 -08:00
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00