| commit | 1df82adc5df58a2da94472d331446a8e22c8ebb1 | [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 | 9917edc4838395a4c554ad62f915731e9e7af942 | |
| parent | 63cf25226003978f4849f414f39d7edc0e238094 [diff] | |
| parent | eb536090ef19ad8550a504ab5704d867121f27cc [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