Narayan Kamath 4ef023e9eb am 9076fa78: Merge "Update EGL codegen to be in sync with frameworks/base" ... * commit '9076fa78d2541fa14253aaf08e6445fafa17e35b': Update EGL codegen to be in sync with frameworks/base		2014-03-08 01:51:14 +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 "Update EGL codegen to be in sync with frameworks/base"	2014-02-21 14:27:36 +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
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00