| commit | a54998f423e684abb3b84fc0d914c7ec0b643346 | [log] [tgz] |
|---|---|---|
| author | Xia Wang <xiaw@google.com> | Wed Nov 24 16:27:17 2010 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 24 16:27:17 2010 -0800 |
| tree | d845ed571fce14edd9853860c31b5a8aa415638e | |
| parent | c4440f039e82d44628146a9f39be7c1fb2d7b792 [diff] | |
| parent | a23fff33517ec4b117064dbc481862abfc55a4c2 [diff] |
am a23fff33: (-s ours) am c1c04ad0: Merge "Add Wi-Fi tests for static IP. DO NOT MERGE" into gingerbread * commit 'a23fff33517ec4b117064dbc481862abfc55a4c2': Add Wi-Fi tests for static IP. DO NOT MERGE