am 16231806: am aed8c32e: Merge change Ie806375b into eclair-mr2

Merge commit '162318062c74428efc454078acfb21a37c279c13'

* commit '162318062c74428efc454078acfb21a37c279c13':
  Adds toast for Geolocation permissions prompt.