Go to file
Jeff Davidson eb329c07c1 am 83f14309: Merge "Revert "Update protobuf library from 2.3 to 2.6.""
* commit '83f14309f17af398ec8ff7f82d9b2f010ea7cd5f':
  Revert "Update protobuf library from 2.3 to 2.6."
2015-01-12 20:10:05 +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 83f14309: Merge "Revert "Update protobuf library from 2.3 to 2.6."" 2015-01-12 20:10:05 +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
NOTICE resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp 2011-01-17 14:17:12 -08:00