Jeff Davidson 83f14309f1 Merge "Revert "Update protobuf library from 2.3 to 2.6.""		2015-01-12 20:00:51 +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	Add binder tests	2014-12-19 00:39:31 +00:00
opengl	Revert "Update protobuf library from 2.3 to 2.6."	2015-01-12 20:00:33 +00:00
services	We have POSIX clocks, and we don't need to ask for the openssl headers.	2015-01-09 15:56:15 -08:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00