Narayan Kamath 87947be618 Merge "Fix mips build for libbinder."		2014-06-04 14:32:59 +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	am 26063a91: am f1dd859b: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"	2014-06-03 13:58:40 +00:00
libs	Merge "Fix mips build for libbinder."	2014-06-04 14:32:59 +00:00
opengl	am ad8d25e8: am 90654afb: Revert "Enable OMAP4 SGX workaround for OMAP3 too"	2014-05-29 17:58:30 +00:00
services	am 4ae6a267: am f3e4fda0: Merge "Remove dependencies on runtime_libdvm and libdvm.so in general"	2014-05-29 19:43:02 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00