tree 0462e215c1a5588007bffb2a80ef5505ed5583a6
parent cb05acfc1df86de9d4f4df9456ded29ce489e594
parent ef34f7b35de777ee2c4f0072ae8a37564bcfd741
author Christopher Schuster <levjj@google.com> 1506111329 +0000
committer android-build-merger <android-build-merger@google.com> 1506111329 +0000

Merge "fixed handling of data URI schemes in Intent.toUri" am: c3d3cf5666 am: 928b7cba47 am: 067cfb369d
am: ef34f7b35d

Change-Id: I9c5a3706850706053d26ecdadf602ab2fafe3e8d