Brian Carlstrom 58ea37fe26 am 108ed9fa: Merge "Fix incorrect odex path handling" ... * commit '108ed9fa946ec516c0d853927c76ebbfca1dcb23': Fix incorrect odex path handling		2014-04-28 22:06:09 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 108ed9fa: Merge "Fix incorrect odex path handling"	2014-04-28 22:06:09 +00:00
data/etc	Add device admin to wearables for API8 Compat	2014-03-17 12:19:18 -07:00
include	am cf818ebb: Merge "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors" into klp-modular-dev	2014-04-11 19:34:53 +00:00
libs	am 85085cd6: Merge "libui: fix passing Fence object over binder"	2014-04-15 02:17:28 +00:00
opengl	am 3f0d5669: Merge "Expose core EGL entry points to eglGetProcAddress"	2014-04-21 18:57:12 +00:00
services	am f3c07d4f: Fix virtual display nesting	2014-04-23 14:36:20 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00