am 0a450da1: am 71aab521: Support for non-purgeable downloads through the public...
authorSteve Howard <showard@google.com>
Mon, 26 Jul 2010 19:30:58 +0000 (12:30 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 26 Jul 2010 19:30:58 +0000 (12:30 -0700)
commit59554027a29a0ad2bcc6ce641cccb0b214be000b
tree9d3f74ca1a33f6ad0da46b2380e6831d0eea5db8
parent1e5f9f05bcc378a30445483b7ef02654ca75fe20
parent0a450da1d9e95f27f479aa45b442960baac49bb1
am 0a450da1: am 71aab521: Support for non-purgeable downloads through the public API.

Merge commit '0a450da1d9e95f27f479aa45b442960baac49bb1'

* commit '0a450da1d9e95f27f479aa45b442960baac49bb1':
  Support for non-purgeable downloads through the public API.
src/com/android/providers/downloads/DownloadProvider.java