OSDN Git Service

am d451b872: (-s ours) am c1a1aa1e: deal with gps renaming
authorBrian Swetland <swetland@google.com>
Wed, 22 Sep 2010 00:44:08 +0000 (17:44 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 22 Sep 2010 00:44:08 +0000 (17:44 -0700)
Merge commit 'd451b872babde2f97da08ba27d60e18643b76f0a'

* commit 'd451b872babde2f97da08ba27d60e18643b76f0a':
  deal with gps renaming


Trivial merge