| commit | 1514919a5d81d42c028e8037acde43db9f55c380 | [log] [tgz] |
|---|---|---|
| author | Dmitry Shmidt <dimitrysh@google.com> | Wed Nov 18 17:53:33 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 18 17:53:33 2009 -0800 |
| tree | c2ca9b07a045b95660fb60c0802554ae8281afd5 | |
| parent | 9411648b74d6f08947228975ebe2d687dff87c55 [diff] | |
| parent | 4a37ed949c6f6793d5539a5fb22c389e2a023f8b [diff] |
am 4a37ed94: am 1052ba99: tnetw1271: Add scan timeout handling Merge commit '4a37ed949c6f6793d5539a5fb22c389e2a023f8b' * commit '4a37ed949c6f6793d5539a5fb22c389e2a023f8b': tnetw1271: Add scan timeout handling