OSDN Git Service

am a23fff33: (-s ours) am c1c04ad0: Merge "Add Wi-Fi tests for static IP. DO NOT...
authorXia Wang <xiaw@google.com>
Thu, 25 Nov 2010 00:27:17 +0000 (16:27 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 25 Nov 2010 00:27:17 +0000 (16:27 -0800)
* commit 'a23fff33517ec4b117064dbc481862abfc55a4c2':
  Add Wi-Fi tests for static IP. DO NOT MERGE


Trivial merge