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