tree 16779ec524e40302bc14aee9816c2870a00aaeba
parent 3ab6aeefcd1a6556d6245dc111a0866120272f4f
parent 74dcb02f5997d70fa9a514f01ace04bb80ef3c72
author Steve Block <steveblock@google.com> 1258681273 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258681273 -0800

am 74dcb02f: am 57534f1b: Improves documentation for GeolocationPermissions class.

Merge commit '74dcb02f5997d70fa9a514f01ace04bb80ef3c72'

* commit '74dcb02f5997d70fa9a514f01ace04bb80ef3c72':
  Improves documentation for GeolocationPermissions class.