resolved conflicts for merge of 43d649e9 to master
Vasu Nori [Thu, 3 Feb 2011 01:05:07 +0000 (17:05 -0800)]
Change-Id: I27a615509269f256cf66de2dd217d8c4667caab4

1  2 
src/com/android/providers/downloads/DownloadInfo.java
src/com/android/providers/downloads/DownloadProvider.java