OSDN Git Service

(root) / android-x86 / external-wpa_supplicant_8.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a27072d 86c93df)
am 86c93df1: Merge "Increase timeouts for p2p" into jb-mr1-dev
authorIrfan Sheriff <isheriff@google.com>
Wed, 31 Oct 2012 20:15:58 +0000 (13:15 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 31 Oct 2012 20:15:58 +0000 (13:15 -0700)
* commit '86c93df1d626c42147db2f2a6dfb5dcad83477ec':
  Increase timeouts for p2p


Trivial merge
external/wpa_supplicant_8
About OSDN
Find Software
Develop Software
Help