tree 2a95e2cdfbe5e8d76a1d705354f4306fe9da92d6
parent d222703b18a52e144b9eeb51ff14ce6bdbfbab83
parent 9364986c83d275509229e5f24ff2b1a27c7842b7
author Jason Monk <jmonk@google.com> 1394476266 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1394476266 +0000

am 9364986c: Merge "Add support for uri favorites and resolve groups" into ub-now-mister-ugly

* commit '9364986c83d275509229e5f24ff2b1a27c7842b7':
  Add support for uri favorites and resolve groups