tree d015c23abed776ba335a2ee2284a73a5a08f53be
parent b243f791d61f673abddc427e6733c4e63ba1f79f
parent 1bc14ed9c3bb0fae28c2cdf9319b2f5f892409eb
author Christopher Tate <ctate@google.com> 1370990232 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1370990232 -0700

am 1bc14ed9: am 76b76666: Merge "Need to explicitly disable scan-always when turning off wifi" into jb-mr2-dev

* commit '1bc14ed9c3bb0fae28c2cdf9319b2f5f892409eb':
  Need to explicitly disable scan-always when turning off wifi