am 797a82b4: am 881e1fe7: am dc622f5e: am 36788815: am a4bd5931: am c454bbe8:...

am 797a82b4: am 881e1fe7: am dc622f5e: am 36788815: am a4bd5931: am c454bbe8: (-s ours) am b15429a6: am 503c5a32: am ea47cb67: (-s ours) am bf6cecc2: am 5716e4bf: am 776b3956: am 7f4d8293: am 6826387e: DO NOT MERGE: Clear cached locations when location providers disab

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