Jesse Hall 9fc06c5e21 am 6e74e3cc: Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev ... * commit '6e74e3ccd972fe90d9998f6b683e25dca38f470d': surfaceflinger: fix -Woverloaded-virtual warning		2014-10-31 22:57:42 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 70ec2941: atrace: fix Sync Manager tracing preventing enabling of kernel sync tracing	2014-10-28 07:21:22 +00:00
data/etc	am 60d31a0f: am 3c648e37: Update comment to use correct GPS file for wearable.	2014-09-19 22:02:37 +00:00
include	Merge "surfaceflinger: fix -Wmismatched-tags warnings" into lmp-mr1-dev	2014-10-31 16:58:45 +00:00
libs	am 1834f8ea: GLConsumer: correct EGL_NO_DISPLAY to EGL_NO_CONTEXT	2014-10-30 20:58:43 +00:00
opengl	am e9034b45: Merge "Use LOCAL_CLANG := false for GLES wrappers for now"	2014-10-16 03:06:42 +00:00
services	am 6e74e3cc: Merge "surfaceflinger: fix -Woverloaded-virtual warning" into lmp-mr1-dev	2014-10-31 22:57:42 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00