tree c0ad8e798c5a141b65117c639fb1fda87522affd
parent c454bbe805bd6ed096ec6b4b811c4e4b67a86225
parent 6f34b9382f0dac64952e0e5c05e96ea2ef3e28e8
author Daniel Cashman <dcashman@google.com> 1389639211 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389639211 -0800

am 6f34b938: am 3238d0d9: Merge "Clear cached locations when location providers disabled Bug: 12118307" into jb-mr2-dev

* commit '6f34b9382f0dac64952e0e5c05e96ea2ef3e28e8':
  Clear cached locations when location providers disabled Bug: 12118307