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