tree 08056689b831a0a0c85cd14babbb7f13cff1c863
parent 1d8f592a752c30534a6e03889f1ba42b232770ef
parent 5716e4bfb980c8bab01b51944c1e715d76d59b1d
author David Christie <dnchrist@google.com> 1389387935 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389387935 -0800

am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307

* commit '5716e4bfb980c8bab01b51944c1e715d76d59b1d':
  DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307