Dianne Hackborn 0fd3bf4652 Merge "Fix issue #9860494: Waiting for service batteryinfo..."		2013-07-16 01:15:44 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Merge "Change legacy "persona" references to userid_t."	2013-07-16 00:19:19 +00:00
data/etc	Add hardware feature android.hardware.bluetooth.le xml file	2013-04-23 11:58:44 -07:00
include	Fix PDK build.	2013-07-15 17:31:13 -07:00
libs	Fix PDK build.	2013-07-15 17:31:13 -07:00
opengl	resolved conflicts for merge of 5477d0e4 to master	2013-07-11 09:40:54 -07:00
services	Merge "Fix issue #9860494: Waiting for service batteryinfo..."	2013-07-16 01:15:44 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00