Dan Albert 7d587c31d5 Merge "Silence warnings about unused parameters."		2014-09-11 02:32:24 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Use time() instead of clock() for timeouts.	2014-09-09 13:36:52 -07:00
data/etc	Adding PackageManager feature strings for stepcounter and stepdetector.	2013-10-13 14:53:45 -07:00
include	Fix clang warnings about struct vs. class.	2014-09-09 15:22:48 -07:00
libs	Make string literal concatenation play nice with C++11.	2014-09-08 18:53:39 -07:00
opengl	GlES2: Add NULL check	2014-08-06 21:53:35 +05:30
services	Merge "Silence warnings about unused parameters."	2014-09-11 02:32:24 +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