Hans Boehm 78b26747e2 am 4a29a80f: resolved conflicts for merge of 08ff8021 to lmp-dev-plus-aosp ... * commit '4a29a80fff163a86959be2e3eb0f4a9d739b5f7d': Revert "Revert "Revert "Revert "Remove incorrect android_atomic_...64 use.""""		2014-09-03 13:49:01 +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 57782cd2: am 5c4a1566: Merge "GLConsumer: Fix eglTerminate/eglInit edge case." into lmp-dev	2014-08-27 18:35:43 +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 883fccb5: am bcbf97ef: Add logging for switch state	2014-09-02 07:09:26 +00:00
MODULE_LICENSE_APACHE2
NOTICE