Elliott Hughes 3e54077d42 am e77cb931: am 259c2508: am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC." ... * commit 'e77cb9317de54ea0041eeef7966b818257158f64': Modified atrace.cpp to recognize ATRACE_TAG_BIONIC.		2014-05-29 01:08:06 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am e77cb931: am 259c2508: am 03e2f8fa: Merge "Modified atrace.cpp to recognize ATRACE_TAG_BIONIC."	2014-05-29 01:08:06 +00:00
data/etc	am 2bb7438c: am c210aec4: Merge "Add android.software.webview software feature." into klp-modular-dev	2014-05-20 17:30:21 +00:00
include	Merge "SurfaceFlinger: Add sourceCrop to screenshot"	2014-05-28 18:31:40 +00:00
libs	Merge "SurfaceFlinger: Add sourceCrop to screenshot"	2014-05-28 18:31:40 +00:00
opengl	am 92374318: am 618c78c0: am dc273621: Merge "EGL: add x86/64 assembly code for EGL/GLES wrappers"	2014-05-27 23:35:10 +00:00
services	Merge "SurfaceFlinger: Add sourceCrop to screenshot"	2014-05-28 18:31:40 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00