tree bea1177b8ebabc011e835541c10203ef1408dcf7
parent e77acbf15e68f346cc8a98e05e45b7cc8307fb4f
parent 7056b5645002b860166382d2f9c20858296526f9
author Paul Miller <paulmiller@google.com> 1437677618 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437677618 +0000

am 7056b564: am a87b7e20: Manual cherry-pick of "Remove bookmarks provider..."

* commit '7056b5645002b860166382d2f9c20858296526f9':
  Manual cherry-pick of "Remove bookmarks provider..."