Colin Cross 368e2eceb7 am 61a4eecb: Merge "atrace: avoid unnecessary writes to trace_clock" into lmp-dev ... * commit '61a4eecbe615bc94944161c4cf4aa590dfca1b2e': atrace: avoid unnecessary writes to trace_clock		2014-08-21 03:06:23 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 61a4eecb: Merge "atrace: avoid unnecessary writes to trace_clock" into lmp-dev	2014-08-21 03:06:23 +00:00
data/etc	am 2eaec5a8: am 1f1ca890: Adding an ECG hardware feature	2014-08-20 18:29:27 +00:00
include	am a54f3b2f: Merge "SensorService fixes." into lmp-dev	2014-08-19 20:34:18 +00:00
libs	am efc0b35f: Merge "Fix CAS argument type."	2014-08-19 22:28:41 +00:00
opengl	am 4c5b9acf: Merge "Don\'t try to capture the pointer when using PBOs for texture APIs" into lmp-dev	2014-08-20 16:32:37 +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