am bcf5a23b: am 331c7788: Store info in the bookmarks/history database on whether it was a manually entered url.
am bcf5a23b: am 331c7788: Store info in the bookmarks/history database on whether it was a manually entered url.

Merge commit 'bcf5a23bfa71e97df4946c8dffd2991ca8e68bf9'

* commit 'bcf5a23bfa71e97df4946c8dffd2991ca8e68bf9':
  Store info in the bookmarks/history database on whether it was a manually entered url.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base