Eino-Ville Talvala 4019179991 am 6c450101: (-s ours) DO NOT MERGE Cherry-pick dataSpace and BufferItem changes ... * commit '6c450101753d0219b151e79007bcded1bfbb058b': DO NOT MERGE Cherry-pick dataSpace and BufferItem changes		2015-04-06 21:15:33 +00:00
build	Increase growth limit from 64m to 80m for 1024mb hdpi tablet	2014-12-11 13:40:37 -08:00
cmds	ServiceManager: Print kernel/userspace binder version	2015-04-03 17:02:48 -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: Plumb attach/detach through Surface	2015-04-02 13:35:45 -07:00
libs	DO NOT MERGE libgui: Plumb attach/detach through Surface	2015-04-02 13:35:45 -07:00
opengl	Merge "[MIPS] Fix mips32r1 build"	2015-03-15 02:41:05 +00:00
services	am c2a5b469: am a527c07b: Merge "Fix mistake using width instead of height."	2015-03-24 21:06:56 +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