OSDN Git Service

am 623a5572: resolved conflicts for merge of 882ad42e to eclair-mr2
authorMike Lockwood <lockwood@android.com>
Mon, 7 Dec 2009 16:09:53 +0000 (08:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Mon, 7 Dec 2009 16:09:53 +0000 (08:09 -0800)
commitb16659533e55476bbe2c0b177943ef8f4129e34a
tree8572341da27537bc6bacf8486841b95a41fc34a6
parentfe8ab167caa0fb93d068a6f93932f9ce3115c327
parent623a5572e894c2114767f5631165354076d0b139
am 623a5572: resolved conflicts for merge of 882ad42e to eclair-mr2

Merge commit '623a5572e894c2114767f5631165354076d0b139' into eclair-mr2-plus-aosp

* commit '623a5572e894c2114767f5631165354076d0b139':
  Add clean step for switching GPS API from pdapi to loc_api