tree bcb4351f5d533edf7539fd6c72458aa80f8f6e24
parent baaf9a246d09fdce3bfc1e83219c5aa91a3f0a20
parent abdf298d67a68f42c8a7954f81afcece73107ea2
author vandwalle <vandwalle@google.com> 1410385102 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1410385102 +0000

am a5ef501a: am 9e444d7a: Merge "make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration" into lmp-dev

* commit 'a5ef501abfec5b93486f59c1140dc5791433656d':
  make autojoin configurable, clean up BSSID info that may be stake in WifiConfiguration