tree d4c7d3994939e298920a9cb4a43adc63230619dc
parent b15429a6853472207c2a4aefd22dd009e851edb7
parent 3238d0d9f98d4d0972e52a81a4e9b8d2aea0436d
author Daniel Cashman <dcashman@google.com> 1389639003 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389639003 -0800

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

* commit '3238d0d9f98d4d0972e52a81a4e9b8d2aea0436d':
  Clear cached locations when location providers disabled Bug: 12118307