Merge commit 'c85df59e1cbc19afd486e2743fc59b3dc5ad8b35' into manual_merge_c85df59
authorJeff Sharkey <jsharkey@android.com>
Fri, 16 Sep 2016 23:44:18 +0000 (17:44 -0600)
committerJeff Sharkey <jsharkey@android.com>
Fri, 16 Sep 2016 23:44:18 +0000 (17:44 -0600)
commitf367d6b2a0431db77c1f49f918c6f8df373e08dc
tree9059a7e76223e5b25d0068d07aa5fe6b1ed63331
parent12d4497cc12cb9390f6efe953bd70bef1e6a41b3
parentc85df59e1cbc19afd486e2743fc59b3dc5ad8b35
Merge commit 'c85df59e1cbc19afd486e2743fc59b3dc5ad8b35' into manual_merge_c85df59

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