Narayan Kamath aaa27fd5a0 Merge "Use reinterpret_cast when an integer is cast to a pointer"		2014-02-25 13:05:49 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Merge "frameworks/native: move idmap to frameworks/base"	2014-02-14 01:45:28 +00: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	Binder: Make sure binder objects do not overlap	2014-02-24 15:42:13 -08:00
opengl	Merge "Use reinterpret_cast when an integer is cast to a pointer"	2014-02-25 13:05:49 +00:00
services	surfaceflinger: add BoardConfig.mk variable to force 32-bit	2014-02-20 15:37:14 -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