tree b7ecb90b14abd16341d34d0118f19da95ab15400
parent 65c8df8530418c66eedb06fa13372bcd41409492
parent 532a21e653c99b23c904f21f9a31325eca450690
author Jouni Malinen <j@w1.fi> 1350245143 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350245143 -0700

am 532a21e6: am 2c5b17df: P2P: Improve robustness against lost ctrl::ack

* commit '532a21e653c99b23c904f21f9a31325eca450690':
  P2P: Improve robustness against lost ctrl::ack