Michael Wright c06283bb8b am 6c4e2d81: (-s ours) am 773585e6: Merge "Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE" into klp-modular-dev ... * commit '6c4e2d816b244c46baac53cbe638ac87be703859': Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE		2014-03-28 19:42:39 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am d9ee7dee: am b1a8c016: Merge "Send libselinux logging to logcat."	2014-03-26 16:36:38 +00:00
data/etc	Add device admin to wearables for API8 Compat	2014-03-17 12:19:18 -07:00
include	Merge "Allow creation of heaps that are read-only to partner"	2014-03-27 22:28:11 +00:00
libs	Merge "Allow creation of heaps that are read-only to partner"	2014-03-27 22:28:11 +00:00
opengl	Request RGBX rather than RGBA	2014-03-25 14:59:26 -07:00
services	am 1b751203: am 50ef8562: Merge "GraphicProducerWrapper may return false transact status"	2014-03-28 09:02:02 +00: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