Chong Zhang cb5368356e Merge "wifi-display: add support for metadata mode on encoder output"		2013-05-18 00:02:10 +00: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	Merge "wifi-display: add support for metadata mode on encoder output"	2013-05-18 00:02:10 +00:00
libs	Merge "Remove unnecessary header file."	2013-05-17 21:58:50 +00: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 e6eef6c1: am ea74d3b7: make the warning timout of Fence::waitForever() implicit and longer	2013-05-17 10:18:45 -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