OSDN Git Service

am 584c5997: (-s ours) am b678f3bb: (-s ours) Add support for GPS privacy lock. ...
authorMike Lockwood <lockwood@android.com>
Wed, 31 Mar 2010 00:41:17 +0000 (17:41 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 31 Mar 2010 00:41:17 +0000 (17:41 -0700)

Trivial merge