resolved conflicts for merge of 73642748 to master
authorVasu Nori <vnori@google.com>
Fri, 4 Feb 2011 02:00:35 +0000 (18:00 -0800)
committerVasu Nori <vnori@google.com>
Fri, 4 Feb 2011 02:00:35 +0000 (18:00 -0800)
commita29b942fe0f868b9d94299877f39a4ddcc3e85cc
tree5fe3b29b023720e9355dfc601ee6afd315a15a52
parented4870094f53bcd19c0542400389a1f56636ce5a
parent736427485a3e23eebec7fbd69cc5b70f9fe478d6
resolved conflicts for merge of 73642748 to master

Change-Id: I477599f16db5ea64e4fbc4d2be68dcedf2c80269
src/com/android/providers/downloads/DownloadProvider.java