John Reck 0faebfb2f5 Merge "Add trace_event_clock_sync to atrace"		2015-03-27 00:13:32 +00:00
build	Increase growth limit from 64m to 80m for 1024mb hdpi tablet	2014-12-11 13:40:37 -08:00
cmds	Add trace_event_clock_sync to atrace	2015-03-26 16:57:30 -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 libgui: Prepare for IGBC::BufferItem removal	2015-03-19 13:58:07 -07:00
libs	DO NOT MERGE libgui: Prepare for IGBC::BufferItem removal	2015-03-19 13:58:07 -07:00
opengl	DO NOT MERGE Add dataSpace to buffer queues; remove old format enums.	2015-03-19 13:56:00 -07:00
services	Fix mistake using width instead of height.	2015-03-23 14:37: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