Jesse Hall 18f94b1e6c resolved conflicts for merge of 51b27e82 to klp-dev-plus-aosp ... File was moved to system/core.git. Change will be applied there. Change-Id: Ic2027b7f3f1f1fb4b896a219a8c1b4ab545d9723		2013-10-30 23:21:24 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	resolved conflicts for merge of e678897f to klp-dev-plus-aosp	2013-09-20 12:45:20 -07:00
data/etc	Adding PackageManager feature strings for stepcounter and stepdetector.	2013-10-13 14:53:45 -07:00
include	Native counterpart of new power manager method	2013-10-25 12:50:04 -07:00
libs	am 708cc794: Native counterpart of new power manager method	2013-10-25 15:01:29 -07:00
opengl	am 40da5283: Merge "EGL: rename CallStack::dump into CallStack::log" into klp-dev	2013-10-30 14:16:19 -07:00
services	Merge "Bug fixes for SensorService" into klp-dev	2013-10-25 23:16:59 +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