tree d839ddb1ceb7f14cff0309262c472287599daada
parent e0ada6319ad39a6f87edf05be1530fa7c3b0e973
parent ad5b0eb7a7571389b0ec1f5195a60e16797920f5
author Wink Saville <wink@google.com> 1363902674 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1363902674 +0000

am ad5b0eb7: Merge "Notify user when wi-fi is toggled about scans" into jb-mr2-dev

* commit 'ad5b0eb7a7571389b0ec1f5195a60e16797920f5':
  Notify user when wi-fi is toggled about scans