John Reck 88c52865f3 am 0faebfb2: Merge "Add trace_event_clock_sync to atrace" ... * commit '0faebfb2f5a07939e7264a94fdcebecc4df39873': Add trace_event_clock_sync to atrace		2015-03-27 00:21:41 +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	Merge "[MIPS] Fix mips32r1 build"	2015-03-15 02:41:05 +00:00
services	am a527c07b: Merge "Fix mistake using width instead of height."	2015-03-24 20:59:51 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00