tree 273b4b3aa02796bc8bdd73e40e26d81c25fa5e25
parent 374b05fb1d1a39dd142f353030e65897ddb74291
parent 3d57f657e682d634ff0c089ce36efe6d82b9de49
author Jason Monk <jmonk@google.com> 1422669687 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422669687 +0000

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

* commit '3d57f657e682d634ff0c089ce36efe6d82b9de49':