| commit | d791f56cce658c4ba5faca5291a50f6fc7411d8a | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <robdroid@android.com> | Thu Oct 22 11:03:03 2009 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 22 11:03:03 2009 -0700 |
| tree | 492845cd8f88cabacc11dfbdbd28be1531cfd50b | |
| parent | 466c08ae9889208b41a475ee8a8f8c2c6483ea8e [diff] | |
| parent | 585449b084ebeaaad4b9d2bc1912490e952c5a01 [diff] |
am 585449b0: am f702f1f3: (-s ours) Merge change I1538dba4 into eclair Merge commit '585449b084ebeaaad4b9d2bc1912490e952c5a01' into eclair-mr2-plus-aosp * commit '585449b084ebeaaad4b9d2bc1912490e952c5a01': Make FWK start a wifi scan if supplicant forgets. (do not merge)