tree f976ce96e178960144fbd217751317b0c71714a4
parent 213be0c4a97cfb388450aaf48693678a3e3492fd
parent 2a6a0f478fb9b67bf7398b1ba7c54ca9c9e430bf
author Steve Block <steveblock@google.com> 1258661112 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258661112 -0800

am 2a6a0f47: Adds an explicit type for GeolocationPermissions.getOrigins.

Merge commit '2a6a0f478fb9b67bf7398b1ba7c54ca9c9e430bf' into eclair-mr2-plus-aosp

* commit '2a6a0f478fb9b67bf7398b1ba7c54ca9c9e430bf':
  Adds an explicit type for GeolocationPermissions.getOrigins.