Vinod Krishnan 291f0396a5 am 708db2d0: (-s ours) am a36d4e2d: am 6de9f394: (-s ours) am 8c967b9b: DO NOT MERGE: Removing android prefix for ECG feature ... * commit '708db2d04447e8a78258a3a0e2782c96ab00f2b2': DO NOT MERGE: Removing android prefix for ECG feature		2014-09-04 23:57:21 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 8c1642ad: Merge "Remove obsolete prunedexcache"	2014-08-29 11:39:54 +00:00
data/etc	Add android.software.live_tv feature	2014-08-28 12:54:17 -07:00
include	am c1ad526c: am 9c0a80b8: Merge "Fix undefined behavior (not returning a value from a function with return)." into lmp-dev	2014-09-04 22:23:18 +00:00
libs	am 57782cd2: am 5c4a1566: Merge "GLConsumer: Fix eglTerminate/eglInit edge case." into lmp-dev	2014-08-27 18:35:43 +00:00
opengl	Don't try to capture the pointer when using PBOs for texture APIs	2014-08-19 17:03:54 +01:00
services	am 41943dd0: am 9e24c319: Merge "Fix type for temp variable" into lmp-dev	2014-09-04 22:23:17 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00