Merge korg/donut into korg/master
authorJean-Baptiste Queru <jbq@google.com>
Sun, 26 Jul 2009 03:44:56 +0000 (20:44 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Sun, 26 Jul 2009 03:44:56 +0000 (20:44 -0700)
commit4cefd59d105583644a261702b488591d31bff813
treef911840574e22efcf50f9059f893d86f9a8639c5
parent40e4d5d84142fc5b95c6804b0cfba95c18dab9ae
parentf0fa1cdc1a36cbe0abd57ef9cf9a636fd1d3e2c8
Merge korg/donut into korg/master

Conflicts:

src/com/android/providers/downloads/DownloadProvider.java
src/com/android/providers/downloads/Helpers.java
src/com/android/providers/downloads/DownloadProvider.java
src/com/android/providers/downloads/Helpers.java
tests/permission/src/com/android/providers/downloads/permission/tests/DownloadProviderPermissionsTest.java