tree 556549c7141f8d18814ae9a408c00c51ce934799
parent 353232ecee06d1828d8628c4e3917e3b428485aa
parent 3d76e2f35ae5e4557979c053aa35c3cf3b02f1c3
author Wei Liu <luciferleo@google.com> 1431457566 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1431457566 +0000

am 3d76e2f3: Merge "Create GpsLocationProvider only if GPS is supported." into lmp-mr1-modular-dev

* commit '3d76e2f35ae5e4557979c053aa35c3cf3b02f1c3':
  Create GpsLocationProvider only if GPS is supported.