tree 96d5f46adeb21e22a77290e4e5c8c1c21bb77023
parent 1807cb4a8896cfa9b187840e403b2b0cc56abf08
parent c3d3cf56668b2bdfd8db470310aad0300d6d3f8c
author Christopher Schuster <levjj@google.com> 1506092523 +0000
committer android-build-merger <android-build-merger@google.com> 1506092523 +0000

Merge "fixed handling of data URI schemes in Intent.toUri"
am: c3d3cf5666

Change-Id: Id4b8ef16f7a428e6c3d8b382387cf575d05926ad