OSDN Git Service

am 930540de: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge
authorThe Android Open Source Project <initial-contribution@android.com>
Tue, 6 Nov 2012 20:20:27 +0000 (12:20 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 6 Nov 2012 20:20:27 +0000 (12:20 -0800)
commitc0aec06214be674ced7106461e9f19c127fb1c70
tree5862b78d667371e87353d024d877a07edf11fa94
parentefb9743f24044390273be6722656c2bf3ffddc7d
parent930540de4415795500e22f02bb707768b7742fc6
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