Michael Wright b1bbfc2d02 Merge "Add Voice Assist key." into lmp-dev		2014-08-22 18:02:01 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Fix validation of system paths in installd.	2014-08-22 14:52:53 +01:00
data/etc	am 2eaec5a8: am 1f1ca890: Adding an ECG hardware feature	2014-08-20 18:29:27 +00:00
include	Add Voice Assist key.	2014-08-21 19:09:49 -07:00
libs	Within CpuConsumer, use gralloc lockAsync/unlockAsync	2014-08-19 19:46:10 +00:00
opengl	Don't try to capture the pointer when using PBOs for texture APIs	2014-08-20 15:21:44 +00:00
services	Merge "Update currentConfig variable when active display is changed." into lmp-dev	2014-08-22 16:34:14 +00: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