tree 65545d30113dc5e9d99ebe5eea615ac1ecd96443
parent cf8ae79ef28b8e25ab67638ee1c86abe6bf06c6b
parent 0a22d43c9143475c889ce54f0de6261e8857ab9d
author vandwalle <vandwalle@google.com> 1422507644 +0000
committer android-build-merger <android-build-merger@google.com> 1422507644 +0000

Merge "aggressively blacklist WifiConfiguration for the purpose of switching network" into lmp-mr1-dev automerge: d169839
automerge: 0a22d43

* commit '0a22d43c9143475c889ce54f0de6261e8857ab9d':
  aggressively blacklist WifiConfiguration for the purpose of switching network