OSDN Git Service

am 74802557: am 6c509ef0: am da822367: am 25261f59: Merge "Increase time between...
authorXia Wang <xiaw@google.com>
Tue, 29 Nov 2011 00:09:32 +0000 (16:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 29 Nov 2011 00:09:32 +0000 (16:09 -0800)
commit199692aa714f0f109efc48c4597aa23c9ce9b4f5
tree6e2a5b9becc6eaef5f8658323b1851ee07d86156
parent2684cb52a485dc2853273c89e91c3f47399658c5
parent6b2a47a000fd2211845ed53f4aaa648beff45b90
am 74802557: am 6c509ef0: am da822367: am 25261f59: Merge "Increase time between wifi stop and wifi start: set to 2 minutes b/issue?id=5629901" into ics-mr0

* commit '748025579912f92609cadd71786805e10281858d':
  Increase time between wifi stop and wifi start: set to 2 minutes http://b/issue?id=5629901