Mark Salyzyn 2ab05fc551 Merge "dumpstate: modify logcat timeout to compensate for storage speed"		2015-06-15 14:27:11 +00:00
build	Increase growth limit from 64m to 80m for 1024mb hdpi tablet	2014-12-11 13:40:37 -08:00
cmds	dumpstate: modify logcat timeout to compensate for storage speed	2015-06-12 13:19:04 -07:00
data/etc	Revert "Camera: Add XML entries and files for new system features"	2014-12-03 11:13:06 -08:00
docs	framework/native/docs: remove doc footer for jd output	2015-05-27 10:13:35 -07:00
include	libgui/SurfaceFlinger: Add getConsumerName	2015-06-09 11:28:37 -07:00
libs	GLConsumer: Fix crop math	2015-06-11 10:20:23 -07:00
opengl	Check that width and height parameters are small.	2015-06-01 11:12:28 -07:00
services	sf: Fix incorrect state reporting in dumpsys	2015-06-11 18:21:18 -04: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