tree d966e1cfdefc94112df84a5e1f6f76073186407c
parent b745ec954272a3c09cca354ad84e2e08b54c8544
parent 0859b764719735e4b9aea5df6051ece13e212841
author Irfan Sheriff <isheriff@google.com> 1285099174 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1285099174 -0700

am 0859b764: Make wifi scan async. (don\'t auto-merge)

Merge commit '0859b764719735e4b9aea5df6051ece13e212841' into gingerbread-plus-aosp

* commit '0859b764719735e4b9aea5df6051ece13e212841':
  Make wifi scan async. (don't auto-merge)