The Android Open Source Project 59a99aaad0 am 9201798c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge ... * commit '9201798cd99d0578fb781aea03635304e49ee3f3':		2013-07-11 10:17:28 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Renaming dalvik.vm.lib to persist.sys.dalvik.vm.lib	2013-07-10 09:51:20 -07:00
data/etc	Add hardware feature android.hardware.bluetooth.le xml file	2013-04-23 11:58:44 -07:00
include	Merge "Pay attention to buffer timestamps"	2013-07-11 14:40:45 +00:00
libs	am 54d97c88: am 9da67a94: am 67481607: Merge "Revert "Second try at adding a compatibility symbol for the MemoryBase constructor.""	2013-07-11 10:16:47 -07:00
opengl	resolved conflicts for merge of 5477d0e4 to master	2013-07-11 09:40:54 -07:00
services	Merge "Pay attention to buffer timestamps"	2013-07-11 14:40:45 +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