tree 2faa33909cf43d1fc9f495e44e618fc01cb16820
parent 3840b27b5ecaf49374a902ff2041eb3b7a5a5f8a
parent 80faaa3558a6d21990ae6bcf24eb7f8015db710f
author Victoria Lease <violets@google.com> 1349129217 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1349129217 -0700

am 80faaa35: am 2961d111: Merge "Avoid NPE in GpsLocationProvider" into jb-mr1-dev

* commit '80faaa3558a6d21990ae6bcf24eb7f8015db710f':
  Avoid NPE in GpsLocationProvider