Andy McFadden ad700d8545 am e950661f: (-s ours) DO NOT MERGE - Disable DispSync resync when not needed ... * commit 'e950661f4559c9f84f67aed9036aa1ec9a100de3': DO NOT MERGE - Disable DispSync resync when not needed		2014-06-12 19:57:12 +00:00
build	Add Dalvik heap definition for 7" xhdpi devices.	2013-05-06 15:06:20 -07:00
cmds	am 17e1d2ca: am 7281ca65: Merge "Pass --top-k-profile-threshold to dex2oat if available."	2014-06-11 21:37:57 +00:00
data/etc	API Review: Update managed profiles feature flag.	2014-06-05 12:57:54 +00:00
include	Merge "surfaceflinger: Replace blank/unblank with setPowerMode"	2014-06-12 03:30:50 +00:00
libs	Merge "surfaceflinger: Replace blank/unblank with setPowerMode"	2014-06-12 03:30:50 +00:00
opengl	am 0cea0a22: am d284c4cd: Merge "Don\'t set LOCAL_MODULE_PATH for native tests."	2014-06-11 17:58:44 +00:00
services	Merge "surfaceflinger: Replace blank/unblank with setPowerMode"	2014-06-12 03:30:50 +00:00
MODULE_LICENSE_APACHE2
NOTICE	resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp	2011-01-17 14:17:12 -08:00