tree 6c415014ee61dc2dab62998d96050b13bfc4f0a4
parent d2488d6ffd7b1a789150abd8d7488764af9c085e
parent ec004f1d40ddfd829584d596d91eef4d2db78db2
author Brian Muramatsu <btmura@android.com> 1295490572 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1295490572 -0800

am ec004f1d: (-s ours) Merge "DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices" into froyo

* commit 'ec004f1d40ddfd829584d596d91eef4d2db78db2':
  DO NOT MERGE fix failing test testWifiInfoProperties for non-telephony devices