am 835f41da: (-s ours) am 8acdb911: Merge "Add support for GPS privacy lock. DO NOT MERGE" into froyo

Merge commit '835f41da7581747b6a03227bcd1e073074ea9329' into kraken

* commit '835f41da7581747b6a03227bcd1e073074ea9329':
  Add support for GPS privacy lock.  DO NOT MERGE
This commit is contained in:
Mike Lockwood
2010-03-30 17:35:18 -07:00
committed by Android Git Automerger

Diff Content Not Available