am 164657ef: (-s ours) Adds an explicit type for GeolocationPermissions.getOrigins. Do not merge.

Merge commit '164657efe67e7d2ce02ec8804d04dd485f91a098' into eclair-mr2

* commit '164657efe67e7d2ce02ec8804d04dd485f91a098':
  Adds an explicit type for GeolocationPermissions.getOrigins. Do not merge.