am 1d151607: am 4013c4b1: am 42d7a0bf: am a7d13fab: am 45aaa377: am a1b89310: am a87bdc1f: Merge commit \'bc39746e\' into manualmerge
* commit '1d151607fbee65fc9fc2bb1cb38a850c1f68bede': DO NOT MERGE: Clear cached locations when location providers disabled Bug: 12118307
This commit is contained in: