Jeff Davidson 4df903dbc7 Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""		2015-01-15 22:49:02 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Fix message when a command times out.	2015-01-09 16:42:56 -08:00
data/etc	am 60d31a0f: am 3c648e37: Update comment to use correct GPS file for wearable.	2014-09-19 22:02:37 +00:00
include	libgui: Enable -Weverything and -Werror	2014-12-05 14:59:29 -08:00
libs	Replace all instances of intptr_t with uintptr_t.	2015-01-13 21:59:44 +00:00
opengl	Merge "Revert "Revert "Update protobuf library from 2.3 to 2.6."""	2015-01-15 22:49:02 +00:00
services	Merge "surfaceflinger: use Mutex timedLock instead of tryLock loop"	2015-01-12 23:33:07 +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