Go to file
Jeff Tinker f0ca9cd773 Merge "Fix non-portable definition of CryptoPlugin::SubSample" 2014-07-01 19:25:54 +00:00
build Add Dalvik heap definition for 7" xhdpi devices. 2013-05-06 15:06:20 -07:00
cmds Use current max product dalvik.vm.heapsize as default dex2oat heap size 2014-06-27 14:15:19 -07:00
data/etc API Review: Update managed profiles feature flag. 2014-06-05 12:57:54 +00:00
include Merge "Fix non-portable definition of CryptoPlugin::SubSample" 2014-07-01 19:25:54 +00:00
libs Merge "BufferQueue: Add allocateBuffers method" 2014-06-27 15:56:14 +00:00
opengl am 0cea0a22: am d284c4cd: Merge "Don\'t set LOCAL_MODULE_PATH for native tests." 2014-06-11 17:58:44 +00:00
services Merge "BufferQueue: Add allocateBuffers method" 2014-06-27 15:56:14 +00:00
MODULE_LICENSE_APACHE2
NOTICE resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp 2011-01-17 14:17:12 -08:00