Dan Stoza 22d0bdf326 resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp ... Change-Id: I0be2ecb8085f2cd9560138460bcc27d71c011608		2015-01-27 11:49:26 -08:00
build	Increase growth limit from 64m to 80m for 1024mb hdpi tablet	2014-12-11 13:40:37 -08:00
cmds	am 346329b7: Merge "Move atrace from the obsolete bzero to memset."	2015-01-25 20:43:27 +00:00
data/etc	Revert "Camera: Add XML entries and files for new system features"	2014-12-03 11:13:06 -08:00
include	libui: Add Rect(uint32_t, uint32_t)	2015-01-21 17:39:13 -08:00
libs	am 4ecf6ec9: Merge "Restore Region::set(uint32_t, uint32_t)"	2015-01-22 00:13:22 +00:00
opengl	am a46ff664: Merge "Use register numbers instead of register names"	2015-01-26 17:39:55 +00:00
services	resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp	2015-01-27 11:49:26 -08: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