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

Merge commit '1138a16137caed3ee88c5219f42edab30ea3c57e'

* commit '1138a16137caed3ee88c5219f42edab30ea3c57e':