The Android Automerger 07e1169537 merge in lmp-release history after reset to lmp-dev		2014-08-26 11:15:15 -07:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	Merge "Fix deadlock when killing adb bugreport" into lmp-dev	2014-08-25 17:31:50 +00:00
data/etc	am 2eaec5a8: am 1f1ca890: Adding an ECG hardware feature	2014-08-20 18:29:27 +00:00
include	Add native flag to reflect new density type	2014-08-22 22:23:08 -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	surfaceflinger: Trace HW vsync enable	2014-08-25 16:05:01 -07: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