Jeff Tinker b2f414fbd6 am 98e5bf2c: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev ... * commit '98e5bf2cc0931fc4e4d88b3f64069bd200690be0': Support CAST V2 Authentication in MediaDrm		2014-04-01 22:00:44 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 3ebb877e: Merge "Modify installd\'s restorecon function."	2014-03-31 20:20:44 +00:00
data/etc	Add device admin to wearables for API8 Compat	2014-03-17 12:19:18 -07:00
include	am 98e5bf2c: Merge "Support CAST V2 Authentication in MediaDrm" into klp-modular-dev	2014-04-01 22:00:44 +00:00
libs	am 773585e6: Merge "Generate ACTION_CANCEL on joystick disconnect. DO NOT MERGE" into klp-modular-dev	2014-03-28 19:37:39 +00:00
opengl	am cdbf28b3: Merge "native frameworks: 64-bit compile issues"	2014-03-13 15:26:10 +00:00
services	am 50ef8562: Merge "GraphicProducerWrapper may return false transact status"	2014-03-28 08:50:09 +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