tree c028bfe537607823c37e2ffc8c713c73059d3130
parent ebc3f00988cd3ab354ecaccd40f62889076883f4
parent 19d76bb7ca777fb59c96fb627a2fd9eacd76dd50
author Jason Monk <jmonk@google.com> 1422685306 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422685306 +0000

am 19d76bb7: am 3d57f657: am c5a764f6: am 266a91db: Merge "Change URI favorite resolving to use launch intents" into ub-now-porkchop

* commit '19d76bb7ca777fb59c96fb627a2fd9eacd76dd50':