OSDN Git Service

am f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo
authorRobert Greenwalt <robdroid@android.com>
Fri, 7 May 2010 00:16:04 +0000 (17:16 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 7 May 2010 00:16:04 +0000 (17:16 -0700)
commit66686441cd995995b15bb05c5f57b53ece7d6475
tree93936635d071bc829e00af9cacd91b800e6433a4
parent363809c71da861e9f4694b047054d79c534a02d3
parent3bc8dc86a130db6e45bd0c9015ba74e5b9e8c48f
am f9dc24de: Merge "Fix ThrottleService wifi interaction" into froyo

Merge commit 'f9dc24de53890e0a8289a4349562ed4bd9611974' into froyo-plus-aosp

* commit 'f9dc24de53890e0a8289a4349562ed4bd9611974':
  Fix ThrottleService wifi interaction