tree dbc0c51694c02c847e76b3d0e5f5d54d35620735
parent 8424925f7df0b9dfd92b1fa030caf1d1d94e3859
parent 859465c105215cc7d0e152ad2280419c4f820598
author Jorim Jaggi <jjaggi@google.com> 1464822131 +0000
committer android-build-merger <android-build-merger@google.com> 1464822131 +0000

Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev am: 13d534e7f2
am: 859465c105

* commit '859465c105215cc7d0e152ad2280419c4f820598':
  Don't crash activity manager when supplying invalid URI

Change-Id: I0e7a036384d4e30a6bfedcefb3eb18774a55538d