The Android Open Source Project 41d9c2ff21 am f0e52b64: (-s ours) Reconcile with jb-mr2-release - do not merge ... * commit 'f0e52b648b435634d8cbcf52cac86c8dac9e4a63':		2013-05-20 08:22:44 -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	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
NOTICE