OSDN Git Service

am 7d96eda0: am 77979736: Merge "P2P: Unblock the code under wpas_p2p_set_group_idle_...
authorDmitry Shmidt <dimitrysh%android.com@gtempaccount.com>
Wed, 24 Apr 2013 18:04:57 +0000 (11:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 24 Apr 2013 18:04:57 +0000 (11:04 -0700)
commit2a96702ab0ec3e15ac53558a051c393d66c1c51e
tree630a15fd2f7115eafcbcac99dcd9b4a43908fa85
parent50440f01fda6a0ffd5757225f4f886afec768516
parent7d96eda062fd58d2ab28311bd0c8ab9193da4080
am 7d96eda0: am 77979736: Merge "P2P: Unblock the code under wpas_p2p_set_group_idle_timeout."

* commit '7d96eda062fd58d2ab28311bd0c8ab9193da4080':
  P2P: Unblock the code under wpas_p2p_set_group_idle_timeout.