Bill Yi 39c5e9f876 am b009280d: am e4f00b2a: (-s ours) Merge commit \'6d05ef2310bdc84811d5b0385b009ad11447a749\' into HEAD ... * commit 'b009280d5acb85a7c7e51daf52a9834ba63a8ae7':		2014-04-30 12:17:24 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Add instruction-set arguments to installd commands.	2014-04-30 09:39:37 +01:00
data/etc	Add feature for voice recognition software.	2014-04-18 11:57:02 -07:00
include	Merge "Move key attribute information out of native."	2014-04-29 22:31:18 +00:00
libs	Merge "Move key attribute information out of native."	2014-04-29 22:31:18 +00:00
opengl	Merge "Revert "Temporarily turn on callstack logging""	2014-04-24 23:49:19 +00:00
services	Merge "Add TYPE_MAGNIFICATION_OVERLAY to isTrustedOverlay"	2014-04-30 00:09:36 +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