am 6d25c81e: Merge "Protection against bookmarks with url=null in the database"

Merge commit '6d25c81ef7ddfc6cbc36094388b2de987dd77dae' into gingerbread-plus-aosp

* commit '6d25c81ef7ddfc6cbc36094388b2de987dd77dae':
  Protection against bookmarks with url=null in the database