The Android Open Source Project ddd466abc1 am 92cf3553: (-s ours) Reconcile with jb-mr2-release - do not merge ... * commit '92cf355308ffb28f8a460d69915ca5955016a632':		2013-05-16 05:48:22 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am d2a92b5b: am db733579: Merge "atrace: add the \'dalvik\' trace category" into jb-mr2-dev	2013-05-08 15:03:56 -07:00
data/etc	Add hardware feature android.hardware.bluetooth.le xml file	2013-04-23 11:58:44 -07:00
include	take the "transparent region" into account for blending	2013-05-10 18:35:43 -07:00
libs	take the "transparent region" into account for blending	2013-05-10 18:35:43 -07:00
opengl	am 7a486528: am f0dcff89: Merge "gl_code.cpp: Remove a DOS style newline"	2013-05-13 13:08:54 -07:00
services	am 28fc78bf: am e8fed71d: Merge "Abort surface composition if hw surface is invalid"	2013-05-13 23:31:54 -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