Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: f084ccd48d -s ours am: d9a7f11334 am: 2436f1e49d am: 90efb1a88d am: 25a7e0e952 am: ee4bc735dc" into nyc-mr2-dev-plus-aosp

am: 4c163a060f  -s ours

Change-Id: I11227a4b2740389c3db93fdb7bf9f2435179f0ec
This commit is contained in:
Jeff Sharkey
2016-12-02 02:31:14 +00:00
committed by android-build-merger

Diff Content Not Available