From: Irfan Sheriff <isheriff@google.com>
Date: Wed, 31 Oct 2012 20:15:58 +0000 (-0700)
Subject: am 86c93df1: Merge "Increase timeouts for p2p" into jb-mr1-dev
X-Git-Tag: android-x86-4.4-r1~66^2~3^2~2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=efb9743f;p=android-x86%2Fexternal-wpa_supplicant_8.git

am 86c93df1: Merge "Increase timeouts for p2p" into jb-mr1-dev

* commit '86c93df1d626c42147db2f2a6dfb5dcad83477ec':
  Increase timeouts for p2p
---

efb9743f24044390273be6722656c2bf3ffddc7d