Hans Boehm 4a29a80fff resolved conflicts for merge of 08ff8021 to lmp-dev-plus-aosp ... Change-Id: I7b57ce5e7d32f6ba4372d7b4af590cc74fd2c7e8		2014-09-02 23:08:28 -07: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 5c4a1566: Merge "GLConsumer: Fix eglTerminate/eglInit edge case." into lmp-dev	2014-08-27 18:26:20 +00:00
libs	am 5c4a1566: Merge "GLConsumer: Fix eglTerminate/eglInit edge case." into lmp-dev	2014-08-27 18:26:20 +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	Add logging for switch state	2014-08-29 14:31:32 -07:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00