tree 1da85f32dbecd5d62e79d5a68d57f0398547714b
parent 3469d55e9a74d68a43c1ba0909ebfdd79780e6a0
parent c9797fed88dbd5796bc91801436d130fc53515c3
author Mike Lockwood <lockwood@android.com> 1273675785 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1273675785 -0700

am e1d7dca6: Merge "LocationManagerService: Call updateNetworkState on providers that are disabled." into froyo

Merge commit 'e1d7dca608ced72c75bf906c7267a1ef30349826' into froyo-plus-aosp

* commit 'e1d7dca608ced72c75bf906c7267a1ef30349826':
  LocationManagerService: Call updateNetworkState on providers that are disabled.