Merge commit 'remotes/korg/cupcake' into merge
authorJean-Baptiste Queru <jbq@google.com>
Tue, 17 Mar 2009 23:35:01 +0000 (16:35 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Tue, 17 Mar 2009 23:35:01 +0000 (16:35 -0700)
commit977d38d21876fbc39598ff0a966a27db92ee1d59
treeadd84188d80cd22ffa3ea87671c6038721790819
parentf8e520e6b7ba9533117d4805a29fb7321534d6ce
parentd311b453a4ea32dcc01e766da972c6837b7705ec
Merge commit 'remotes/korg/cupcake' into merge

Conflicts:
docs/index.html
src/com/android/providers/downloads/DownloadProvider.java
src/com/android/providers/downloads/DownloadService.java
src/com/android/providers/downloads/DownloadService.java