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

am a87bdc1f: Merge commit \'bc39746e\' into manualmerge

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