tree ab3e35fea63bb73f1d9cc624b7afff4cd4be4ea5
parent 5e782937ead3042255d83f9c1192f2cc7b688d74
parent 9714d2c4d2a7563ce5ffdc1726461b24e9f1e599
author Adam Bliss <abliss@google.com> 1279553786 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1279553786 -0700

am 9714d2c4: Merge "Don\'t throw an exception from isProviderEnabled and getLastKnownLocation" into gingerbread

Merge commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599' into gingerbread-plus-aosp

* commit '9714d2c4d2a7563ce5ffdc1726461b24e9f1e599':
  Don't throw an exception from isProviderEnabled and getLastKnownLocation