OSDN Git Service

am b678f3bb: (-s ours) Add support for GPS privacy lock. DO NOT MERGE
authorMike Lockwood <lockwood@android.com>
Wed, 31 Mar 2010 00:35:12 +0000 (17:35 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 31 Mar 2010 00:35:12 +0000 (17:35 -0700)
commit584c59973e19c9f50fa8dc4f8c84c59c8aa34614
tree91f36e1ecc63aaa433618d0252783cab05ffa224
parent68f279fa86145752e424a9cbed1a2e2ee21e10b1
parentb678f3bb6c3fa3cc88cda872909ace5791a6304c
am b678f3bb: (-s ours) Add support for GPS privacy lock.  DO NOT MERGE

Merge commit 'b678f3bb6c3fa3cc88cda872909ace5791a6304c' into kraken

* commit 'b678f3bb6c3fa3cc88cda872909ace5791a6304c':
  Add support for GPS privacy lock.  DO NOT MERGE