Merge commit '40238b9a601d58d2b4f88da7b14823e8c0340bc6' into manual_merge_40238b9
authorJeff Sharkey <jsharkey@android.com>
Fri, 16 Sep 2016 23:06:48 +0000 (17:06 -0600)
committerJeff Sharkey <jsharkey@android.com>
Fri, 16 Sep 2016 23:06:48 +0000 (17:06 -0600)
commit1d0dcb200d466cd4b03f65fa03f16c7944a0b6c1
tree42776831a9f277f9dd9c119bbcdf085ff3d8381e
parent85a6e20a85c4c1d2fb8167b4572230c6fdccfb38
parent40238b9a601d58d2b4f88da7b14823e8c0340bc6
Merge commit '40238b9a601d58d2b4f88da7b14823e8c0340bc6' into manual_merge_40238b9

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