OSDN Git Service

am 3957b3c1: Merge "scan only when wifi is enabled" into froyo
authorIrfan Sheriff <isheriff@google.com>
Sat, 10 Apr 2010 18:47:09 +0000 (11:47 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 10 Apr 2010 18:47:09 +0000 (11:47 -0700)
commita4bbf55305e11c210b226951ceb90e27375a402a
treee8872a80a9f9b0c36247313cb5888835f97000d5
parentdf7d8ee6a59fe67bf41f026b1245238c21acd56e
parent3957b3c147673d631feef2df49f1177289e08d41
am 3957b3c1: Merge "scan only when wifi is enabled" into froyo

Merge commit '3957b3c147673d631feef2df49f1177289e08d41' into kraken

* commit '3957b3c147673d631feef2df49f1177289e08d41':
  scan only when wifi is enabled