am 23588104: am 971e5787: Merge "Revert "Replace legacy Browser with BookmarkProvider""
am 23588104: am 971e5787: Merge "Revert "Replace legacy Browser with BookmarkProvider""

* commit '23588104d5659ea797666c10a63a9b2c7ba8a09c':
  Revert "Replace legacy Browser with BookmarkProvider"

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build