Joe Onorato 6a045ca18f 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

..

assets

…

res

Merge commit 'fce12613' into HEAD

2011-05-31 14:11:58 -07:00

Android.mk

…

AndroidManifest.xml

Add a new permission for user space VPN applications.

2011-05-16 15:16:58 -07:00

MODULE_LICENSE_APACHE2

…

NOTICE

…