Bill Yi e4f00b2aae Merge commit '6d05ef2310bdc84811d5b0385b009ad11447a749' into HEAD		2014-04-29 11:34:19 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Merge commit '6d05ef2310bdc84811d5b0385b009ad11447a749' into HEAD	2014-04-29 11:34:19 -07:00
data/etc	Adding PackageManager feature strings for stepcounter and stepdetector.	2013-10-13 14:53:45 -07:00
include	Merge commit '6d05ef2310bdc84811d5b0385b009ad11447a749' into HEAD	2014-04-29 11:34:19 -07:00
libs	Merge commit '6d05ef2310bdc84811d5b0385b009ad11447a749' into HEAD	2014-04-29 11:34:19 -07:00
opengl	Merge "Expose core EGL entry points to eglGetProcAddress"	2014-04-21 18:51:18 +00:00
services	Merge commit '6d05ef2310bdc84811d5b0385b009ad11447a749' into HEAD	2014-04-29 11:34:19 -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