tree c429be7f0017b134bc1090a4eb8d4da76db5ce13
parent fe464a76d8fc858be971dbb5e67b1d22fd925347
parent a4c2caac05009512213454d329579a79dde11e5f
author Xia Wang <xiaw@google.com> 1322524849 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1322524849 -0800

Merge "Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901" into ics-mr0