tree 66155195c6c941a7ece09ed46af315e969a4b110
parent 70c7844ff0156926dfa58896c911de71982bd638
parent b7ee3b51919842cd26eb865d28cd9ce8e3ba5a2e
author John Reck <jreck@android.com> 1347555242 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1347555242 -0700

am b7ee3b51: Merge "BrowserSettings required a Controller sometimes"

* commit 'b7ee3b51919842cd26eb865d28cd9ce8e3ba5a2e':
  BrowserSettings required a Controller sometimes