tree 7825b581f0c34f07f89f566e3c341ca5c01ab2e3
parent 38c65b1f70042bc8e37e91106692158f0ce98703
parent 21a801d0885d65f128b84a593140b07fd0d4e980
author Daniel Cashman <dcashman@google.com> 1389639637 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389639637 +0000

am 21a801d0: am 0d30e07d: am 3d5ea26f: am 4503409a: Merge "Clear cached locations when location providers disabled Bug: 12118307" into klp-dev

* commit '21a801d0885d65f128b84a593140b07fd0d4e980':
  Clear cached locations when location providers disabled Bug: 12118307