Go to file
Joe Onorato d53f2fa6c5 Merge commit 'fce12613' into HEAD
Conflicts:
	core/res/res/layout-sw600dp/status_bar_latest_event_content.xml
	core/res/res/layout-sw600dp/status_bar_latest_event_content_large_icon.xml
	core/res/res/layout-xlarge/status_bar_latest_event_content_large_icon.xml
	core/res/res/layout/status_bar_latest_event_content_large_icon.xml

Change-Id: I9e7182df4035e625af6d50d70f37078ae33d6e5d
2011-05-31 14:11:58 -07:00
cmds Support wrapping app processes to inject debug instrumentation. 2011-05-24 12:01:25 -07:00
include 9-axis sensor fusion with Kalman filter 2011-05-27 17:04:55 -07:00
libs 9-axis sensor fusion with Kalman filter 2011-05-27 17:04:55 -07:00
opengl fix x86 build 2011-05-23 17:48:36 -07:00
services/surfaceflinger Merge "Fix a race that could cause GL commands to be executed from the wrong thread." 2011-05-19 19:42:20 -07:00
vpn Make VpnService synchronous API. 2011-01-20 12:51:43 +08:00
MODULE_LICENSE_APACHE2
NOTICE resolved conflicts for merge of adee6b35 to honeycomb-plus-aosp 2011-01-17 14:17:12 -08:00