Greg Hackmann 112aa42e91 Merge "SurfaceFlinger: fix 64-bit format string warnings"		2014-03-07 21:47:30 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Don't pass in empty arg to dex2oat.	2014-03-05 16:58:48 -08:00
data/etc	Adding PackageManager feature strings for stepcounter and stepdetector.	2013-10-13 14:53:45 -07:00
include	Fixed apparent copy/paste mistake	2014-02-05 11:19:04 +08:00
libs	Merge "gui: Fix return code assert in CpuConsumer_test."	2014-03-04 21:05:41 +00:00
opengl	hwc test: 64-bit compilation error	2014-03-04 09:11:04 -08:00
services	SurfaceFlinger: fix 64-bit format string warnings	2014-03-07 12:45:13 -08: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