Jeff Davidson b9b86f644f am 4df903db: Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6.""" ... * commit '4df903dbc71c48e2db6fae9390795b81782470b4': Revert "Revert "Update protobuf library from 2.3 to 2.6.""		2015-01-15 23:02:01 +00:00
build	Increase growth limit from 64m to 80m for 1024mb hdpi tablet	2014-12-11 13:40:37 -08:00
cmds	am 457731f6: Use the timeout stack dump functions.	2015-01-15 01:52:14 +00:00
data/etc	Revert "Camera: Add XML entries and files for new system features"	2014-12-03 11:13:06 -08:00
include	am 806f23de: OpenMax IL: Added support for E-AC3 codec configuration params	2015-01-10 02:00:07 +00:00
libs	am aec92242: Merge "Replace all instances of intptr_t with uintptr_t."	2015-01-13 23:26:02 +00:00
opengl	am 4df903db: Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""	2015-01-15 23:02:01 +00:00
services	am 5b730570: Merge "surfaceflinger: use Mutex timedLock instead of tryLock loop"	2015-01-12 23:41:46 +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