tree fe825fbd153f11750967b24b6c1864676beed810
parent dc6bcdf8a0b4a64419b2b75259a38a5507d79b24
parent 18fa8f6006ede3887218d55a290fc1af1a961302
author Ryan Campbell <ryanjcampbell@google.com> 1495834924 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1495834925 +0000

Merge "Merge favorites and preferences UI."