| commit | 78d74f90f3a0afe3b834ea0d15d8e00c2c354888 | [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 | 25d414048817d4a815150609c0ee56b358a0b4bb | |
| parent | 832ed7421521aed52670024016c7405d0bba1dd8 [diff] | |
| parent | 1311fffca030755e900a44d9fdd9cf99ec510b7d [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)