Christopher Ferris 9368dadcbc am 16c62c46: am 50ad67e4: Merge "Add better timeout mechanism for running commands." ... * commit '16c62c468aacf40496a7cad94f49795a797cdd37': Add better timeout mechanism for running commands.		2015-02-04 18:56:45 +00:00
build	Increase growth limit from 64m to 80m for 1024mb hdpi tablet	2014-12-11 13:40:37 -08:00
cmds	am 50ad67e4: Merge "Add better timeout mechanism for running commands."	2015-02-04 02:08:44 +00:00
data/etc	Revert "Camera: Add XML entries and files for new system features"	2014-12-03 11:13:06 -08:00
include	Merge "Add ProcessInfoService to activity manager."	2015-02-03 20:23:14 +00:00
libs	Merge "Add ProcessInfoService to activity manager."	2015-02-03 20:23:14 +00:00
opengl	am d6fce7ab: Merge "Remove lock around ref count check in terminate." into lmp-mr1-dev	2015-01-28 22:38:42 +00:00
services	am 40b4e23a: Merge "resolved conflicts for merge of 1665c8e1 to lmp-mr1-dev-plus-aosp" into lmp-mr1-dev-plus-aosp	2015-01-27 23:42: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