resolved conflicts for merge of 2ca55fd3 to master
authorNick Kralevich <nnk@google.com>
Sat, 15 Mar 2014 02:32:15 +0000 (19:32 -0700)
committerNick Kralevich <nnk@google.com>
Sat, 15 Mar 2014 02:32:15 +0000 (19:32 -0700)
commitb9e36b4f5390c9100d567cbe6e61a3304e37e680
treeb183df935bd645c93e4b86069e1ee5bffb2c03aa
parentf5d88b498c309782f9bf71650d972f8bbb784d98
parent2ca55fd39b9b8a750e77ef4db4ee946fa03442ac
resolved conflicts for merge of 2ca55fd3 to master

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