Colin Cross 61a4eecbe6 Merge "atrace: avoid unnecessary writes to trace_clock" into lmp-dev		2014-08-20 12:26:29 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	atrace: avoid unnecessary writes to trace_clock	2014-08-20 14:28:47 -07:00
data/etc	am 2eaec5a8: am 1f1ca890: Adding an ECG hardware feature	2014-08-20 18:29:27 +00:00
include	SensorService fixes.	2014-08-19 11:18:25 -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	sf: Clear display configs when hot pluggable display is disconnected	2014-08-20 15:10:14 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00