Merge "Don\'t crash activity manager when supplying invalid URI" into nyc-dev am: 13d534e7f2
am: a036c209db
* commit 'a036c209db568bb0e0a962f58e1edb0cb628f09d':
Change-Id: I99a1ca15d0df084bfbed8c95bf322e48e59f532e
This commit is contained in: