tree 4648d15902057a58a95e1c7303a1cadbfaad94a6
parent 32c34a0e4cc0bd7caa67e3052ce01e4533cc2181
parent 06fc3eccb65b1d46d0b8ab7ccf460c03fca7bbb9
author Alex Klyubin <klyubin@google.com> 1429750601 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1429750601 +0000

am 06fc3ecc: am 2a856dee: Merge "P2P: Validate SSID element length before copying it"

* commit '06fc3eccb65b1d46d0b8ab7ccf460c03fca7bbb9':
  P2P: Validate SSID element length before copying it