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)
Merge commit 'b678f3bb6c3fa3cc88cda872909ace5791a6304c' into kraken

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


Trivial merge