Dianne Hackborn 1962f65137 Merge "Follow framework change to track started ops by proc."		2013-07-18 18:13:14 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Merge "always pass the BufferQueue explicitely to consumers"	2013-07-16 02:17:58 +00:00
data/etc	Add hardware feature android.hardware.bluetooth.le xml file	2013-04-23 11:58:44 -07:00
include	Merge "Follow framework change to track started ops by proc."	2013-07-18 18:13:14 +00:00
libs	Follow framework change to track started ops by proc.	2013-07-17 17:26:15 -07:00
opengl	am 082fc1ca: am ae961022: Merge "EGL: Fix error for eglCreateWindowSurface"	2013-07-17 14:13:56 -07:00
services	Fix build -- update for function signature change	2013-07-16 13:46:20 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00