The Android Open Source Project f0e52b648b Reconcile with jb-mr2-release - do not merge ... Change-Id: I400727c668eff57b5760595787d21dd021464587		2013-05-20 08:20:26 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am db733579: Merge "atrace: add the \'dalvik\' trace category" into jb-mr2-dev	2013-05-07 18:23:18 -07: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	make the warning timout of Fence::waitForever() implicit and longer	2013-05-16 18:15:57 -07:00
opengl	am f0dcff89: Merge "gl_code.cpp: Remove a DOS style newline"	2013-05-13 13:05:36 -07:00
services	am 23dacde4: [DO NOT MERGE] fix a bug where surfaceflinger and system_server could deadlock	2013-05-17 13:53:31 -07: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