tree 2a95e2cdfbe5e8d76a1d705354f4306fe9da92d6
parent bfbd52a5e618a86dc7a13bb5e4866759e181a7cb
parent 41314973b44202fd0d1daea3e67bdc92e9110989
author Jason Monk <jmonk@google.com> 1394476177 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1394476178 +0000

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