The Android Automerger 741fac3fee merge in jb-mr1-release history after reset to jb-mr1-dev		2012-08-15 06:34:21 -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 "Add a very simple helper function to log slow functions." into jb-mr1-dev	2012-08-13 23:35:08 -07:00
libs	Merge "Add a very simple helper function to log slow functions." into jb-mr1-dev	2012-08-13 23:35:08 -07:00
opengl	Add compile-time option to systrace GL-ES calls	2012-08-13 12:13:05 -07:00
services	Don't crash when recovering from WM death	2012-08-14 15:33:04 -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