The Android Automerger e082dd6df2 merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev		2013-06-12 05:56:00 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Merge "atrace: add the 'dalvik' trace category" into jb-mr2-dev	2013-05-08 01:21:17 +00:00
data/etc	Add hardware feature android.hardware.bluetooth.le xml file	2013-04-23 11:58:44 -07:00
include	make the warning timout of Fence::waitForever() implicit and longer	2013-05-16 18:15:57 -07:00
libs	Prevent IPCThreadState::joinThreadPool from spinning on unexpected error	2013-06-11 18:03:01 -07:00
opengl	Generate new EGLExt class	2013-05-02 13:44:29 -07:00
services	[DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock	2013-05-17 13:20:53 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00