OSDN Git Service

am ca12cfa9: Do not attempt to parse javascript: bookmarks as URIs, as this often...
authorBen Murdoch <benm@google.com>
Wed, 18 Nov 2009 19:46:14 +0000 (11:46 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 18 Nov 2009 19:46:14 +0000 (11:46 -0800)
Merge commit 'ca12cfa98fdf995c4cf37f487a050d0d4fb261e0' into eclair-mr2-plus-aosp

* commit 'ca12cfa98fdf995c4cf37f487a050d0d4fb261e0':
  Do not attempt to parse javascript: bookmarks as URIs, as this often fails.


Trivial merge