am c5b7da7e: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/packages/apps/Browser into eclair-mr2-plus-aosp

Merge commit 'c5b7da7ec6588ce057d921abf73915a62ef66cf2'

* commit 'c5b7da7ec6588ce057d921abf73915a62ef66cf2':
  We should handle all four cases when strip the "client".