Merge "DO NOT MERGE. Retain DownloadManager Uri grants when clearing. am: 3b0aa060a3 am: 3e0d93036b am: 061e7313b4 am: 50102e63da -s ours am: e94d76436b am: 40b4b1f774 am: ced9dde8c0 am: 18f2836082 am: 8e1fb24415" into nyc-mr2-dev-plus-aosp

am: 8919f020ff  -s ours

Change-Id: I3a52702bd90ac145b3297c8f7c02ed8569b7c207
This commit is contained in:
Jeff Sharkey
2016-12-02 02:26:58 +00:00
committed by android-build-merger

Diff Content Not Available