The Android Automerger 48727a74ae merge in klp-release history after reset to master		2013-07-17 06:00:37 -07: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 "always pass the BufferQueue explicitely to consumers"	2013-07-16 02:17:58 +00:00
libs	always pass the BufferQueue explicitely to consumers	2013-07-15 22:20:35 -07:00
opengl	resolved conflicts for merge of 5477d0e4 to master	2013-07-11 09:40:54 -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