tree 88932fed46ea0ca54dc3e2b030d4435a1317801e
parent ea198841a9e64d72de49811e0e2c555eb2c40b9b
parent 7f4d82932c812fbac1d99ceaf9462b7a763f5231
author David Christie <dnchrist@google.com> 1389387609 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389387609 -0800

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

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