Mathias Agopian e21facef01 Merge "log more info on fence sync_merge error" into jb-mr1-dev		2012-07-30 15:22:00 -07:00
build	I am having second thoughts about 512m for the large heap size.	2012-06-08 13:02:09 -07:00
cmds	move sensorservice from frameworks/base to frameworks/native	2012-06-28 15:06:35 -07:00
data/etc	Move com.nxp.mifare to frameworks/native.	2012-04-12 21:24:08 -07:00
include	Merge remote-tracking branch 'goog/jb-dev-mako' into jb-mr1-dev	2012-07-28 09:55:54 -07:00
libs	Merge "log more info on fence sync_merge error" into jb-mr1-dev	2012-07-30 15:22:00 -07:00
opengl	Fixed bug in opengl es binding generation	2012-07-23 17:06:52 -07:00
services	get rid of the shared-memory control block	2012-07-25 21:13:10 -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