tree 3ebe26524e05d6a57529c457be9d69816d8edb38
parent 4368ba45adebf17d7962ad551363ac302cb2b1c7
parent 3272a38dbc5fdf2d68b653592a244059cd29255a
author Xia Wang <xiaw@google.com> 1348685938 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1348685939 -0700

Merge "Fix Wifi Stress test after wifi settings are moved to Settings.global" into jb-mr1-dev