tree 630a15fd2f7115eafcbcac99dcd9b4a43908fa85
parent 5d1c8ad11de48ba5e449e83e1e5dcd844e9c35d1
parent 77979736ea5fe4448d77937df56d84d263436034
author Dmitry Shmidt <dimitrysh%android.com@gtempaccount.com> 1366826513 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1366826513 -0700

am 77979736: Merge "P2P: Unblock the code under wpas_p2p_set_group_idle_timeout."

* commit '77979736ea5fe4448d77937df56d84d263436034':
  P2P: Unblock the code under wpas_p2p_set_group_idle_timeout.