tree 6ed41290737606a89f8f9b3a42590a7aa4d034d4
parent 77ed6ca277eb9a21614197941fea63380c1914a1
parent 14226e7b434c7db01fab0360c087fc607054473a
author Jeff Sharkey <jsharkey@android.com> 1480644967 +0000
committer android-build-merger <android-build-merger@google.com> 1480644967 +0000

DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 1de465bec2 am: b9a0b79675  -s ours am: 1da786d723 am: af5f47caca am: ee8e0e8ae3 am: f70dd1fbc1  -s ours am: 60f17b8505 am: ca44afff8a am: f2688ddcb7 am: f5ab66fd9a
am: 14226e7b43

Change-Id: Id222b26a369f3abbd316bd601bf2c622ffc57ebb