tree fa74b1f1e6db182562a07967c8a5dca951a34dd0
parent caa9aa08aaa5d3e879fcccad5c4bcb1c79fba6e3
parent 24956d36f46dd7be0b029a7b2b43c1020ae8a4c5
author Mike Lockwood <lockwood@android.com> 1285036438 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285036438 -0700

am 24956d36: am 307aef01: Merge "LocationManager: Hide location provider and geocode provider APIs." into gingerbread

Merge commit '24956d36f46dd7be0b029a7b2b43c1020ae8a4c5'

* commit '24956d36f46dd7be0b029a7b2b43c1020ae8a4c5':
  LocationManager: Hide location provider and geocode provider APIs.