Dan Stoza f44d13e7e5 Merge "DO NOT MERGE Add dataSpace to buffer queues; remove old format enums."		2015-03-20 18:36:19 +00:00
build	Increase growth limit from 64m to 80m for 1024mb hdpi tablet	2014-12-11 13:40:37 -08:00
cmds	dumpstate: add O_CLOEXEC	2015-03-19 11:32:02 -07:00
data/etc	Revert "Camera: Add XML entries and files for new system features"	2014-12-03 11:13:06 -08:00
include	DO NOT MERGE Add dataSpace to buffer queues; remove old format enums.	2015-03-19 13:56:00 -07:00
libs	DO NOT MERGE Add dataSpace to buffer queues; remove old format enums.	2015-03-19 13:56:00 -07:00
opengl	DO NOT MERGE Add dataSpace to buffer queues; remove old format enums.	2015-03-19 13:56:00 -07:00
services	DO NOT MERGE Add dataSpace to buffer queues; remove old format enums.	2015-03-19 13:56:00 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00