Colin Cross 40d580710b am 6b4ecf31: Merge "surfaceflinger: add BoardConfig.mk variable to force 32-bit" ... * commit '6b4ecf314461067c0e05130edaf785fb010f471a': surfaceflinger: add BoardConfig.mk variable to force 32-bit		2014-03-07 23:19:26 +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	am 74be0f7b: Merge "binder: fix all warnings"	2014-03-07 02:23:38 +00:00
opengl	Merge "libagl: support multilib build"	2014-02-18 21:29:50 +00:00
services	am 6b4ecf31: Merge "surfaceflinger: add BoardConfig.mk variable to force 32-bit"	2014-03-07 23:19:26 +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