David Srbecky 0a394f5428 Merge commit '3822b8b7' into mnc-dev-plus-aosp		2015-06-19 20:36:37 +01:00
build	Increase growth limit from 64m to 80m for 1024mb hdpi tablet	2014-12-11 13:40:37 -08:00
cmds	am 3a6a953c: am 2ab05fc5: Merge "dumpstate: modify logcat timeout to compensate for storage speed"	2015-06-15 14:47:27 +00:00
data/etc	Adding a configuration file to support hifi sensors feature.	2015-04-10 11:26:02 -07:00
docs	framework/native/docs: remove doc footer for jd output	2015-05-27 10:13:35 -07:00
include	am 8a4222a6: Merge "Add tracing header" into mnc-dev	2015-06-11 02:08:20 +00:00
libs	GLConsumer: Fix crop math	2015-06-11 10:20:23 -07:00
opengl	Check that width and height parameters are small.	2015-05-29 10:54:30 -07:00
services	am e04e4edc: sf: Fix incorrect state reporting in dumpsys	2015-06-12 17:31:23 +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