Nick Kralevich 7f1ea80d65 resolve merge conflicts of 834ac204ce to klp-modular-dev. ... Bug: 23905002 Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3		2015-10-22 17:26:28 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	dumpstate: increase poll timeout waiting for SIGQUIT logging	2014-04-30 11:28:31 -07:00
data/etc	Update comment to use correct GPS file for wearable.	2014-09-19 14:33:51 -07:00
include	resolve merge conflicts of 834ac204ce to klp-modular-dev.	2015-10-22 17:26:28 -07:00
libs	add number constraint for samples per MotionEvent	2015-10-22 02:02:46 +00:00
opengl	Revert "Enable OMAP4 SGX workaround for OMAP3 too"	2014-05-29 08:55:27 -07:00
services	surfaceflinger: skip composition for empty frames	2014-08-19 22:15:43 -07: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