tree 630a15fd2f7115eafcbcac99dcd9b4a43908fa85
parent 50440f01fda6a0ffd5757225f4f886afec768516
parent 7d96eda062fd58d2ab28311bd0c8ab9193da4080
author Dmitry Shmidt <dimitrysh%android.com@gtempaccount.com> 1366826697 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366826697 -0700

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.