tree 5862b78d667371e87353d024d877a07edf11fa94
parent efb9743f24044390273be6722656c2bf3ffddc7d
parent 930540de4415795500e22f02bb707768b7742fc6
author The Android Open Source Project <initial-contribution@android.com> 1352233227 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352233227 -0800

am 930540de: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge

* commit '930540de4415795500e22f02bb707768b7742fc6':
  P2P: Fix network removal to select correct block
  wpa_supplicant: Postpone P2P scan if usual scan is in progress