am aed8c32e: Merge change Ie806375b into eclair-mr2

Merge commit 'aed8c32e130fbd53349b1309734885262e3e552c' into eclair-mr2-plus-aosp

* commit 'aed8c32e130fbd53349b1309734885262e3e552c':
  Adds toast for Geolocation permissions prompt.