tree 10da860fcff71886af91d082e31f0e1917926848
parent 9f6f286f4fd67ae7a77b49d07f85df8ac15a5e71
parent c5a764f68c26edd9de0590d4b1797856fed7d2a2
author Jason Monk <jmonk@google.com> 1422666475 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422666475 +0000

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

* commit 'c5a764f68c26edd9de0590d4b1797856fed7d2a2':