Jeff Davidson 7581a96bfd am 9200d4e3: Merge "Update protobuf library from 2.3 to 2.6." ... * commit '9200d4e3bf0bf9bf21d9bb335e04818364bf12a8': Update protobuf library from 2.3 to 2.6.		2015-01-12 19:46:11 +00:00
build	Increase growth limit from 64m to 80m for 1024mb hdpi tablet	2014-12-11 13:40:37 -08:00
cmds	am 4f9bfffe: Merge "Fix message when a command times out."	2015-01-12 18:48:23 +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 53186a4d: Merge "Add binder tests"	2014-12-19 03:52:36 +00:00
opengl	am 9200d4e3: Merge "Update protobuf library from 2.3 to 2.6."	2015-01-12 19:46:11 +00:00
services	am a7dcab69: Merge "We have POSIX clocks, and we don\'t need to ask for the openssl headers."	2015-01-10 00:14:12 +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