Nick Kralevich e4e91c4ead resolved conflicts for merge of e678897f to klp-dev-plus-aosp ... Change-Id: Ie2a5e7a917ab7f5a0ee98300b880d22c7a10bf70		2013-09-20 12:45:20 -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	Enable FEATURE_DEVICE_ADMIN for handheld devices	2013-09-16 10:48:35 -07:00
include	GLConsumer: Add query for current frame number.	2013-09-19 13:36:07 -07:00
libs	am d171da97: GLConsumer: Add query for current frame number.	2013-09-19 14:59:51 -07:00
opengl	Disable the egl_khr_gl_colorspace extension	2013-09-16 11:21:48 -07:00
services	reinstate black-screenshot debugging code	2013-09-19 17:09:26 -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