tree fa76a3ed94408da0e0b0d638db1f2dbd9b2c41af
parent 98c531dca9e52af280ca002658bbe38775b3f6ae
parent 8f5dd9ad3f98d97d2862b57ba8cd961d2201e40c
author Mike Lockwood <lockwood%android.com@gtempaccount.com> 1312469337 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1312469337 -0700

am 8f5dd9ad: Merge "GPS Provider Service changes"

* commit '8f5dd9ad3f98d97d2862b57ba8cd961d2201e40c':
  GPS Provider Service changes