| commit | 6963291ab58591c99ce17ac8f76141ba45e76d8c | [log] [tgz] |
|---|---|---|
| author | Irfan Sheriff <isheriff@google.com> | Tue Sep 21 13:10:30 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 21 13:10:30 2010 -0700 |
| tree | 424c9c46ae409458d3a69e125e2adf01cc01c144 | |
| parent | c2087e3c7acde1d3f14ebd83e68ca967b058468e [diff] | |
| parent | d404a9be14715efdea447ec4ed3e7677ab72e641 [diff] |
am d404a9be: (-s ours) am 0859b764: Make wifi scan async. (don\'t auto-merge) Merge commit 'd404a9be14715efdea447ec4ed3e7677ab72e641' * commit 'd404a9be14715efdea447ec4ed3e7677ab72e641': Make wifi scan async. (don't auto-merge)