tree 529b2c2ef7f6783092af3e5d23ecd3447db7466e
parent dc254cffc064353634d2823df529946f956a8082
author Ningyuan Wang <nywang@google.com> 1476211332 -0700
committer Liisa Anttonen <liisa.anttonen@nedevicesw.com> 1482490382 +0200

resolve merge conflicts of 849c5c7 to mnc-dev

This resovles the merge conflict for ag/1514448/
After Android M, this function uses num_bssid instead of num_ap.
Both are prone to stack overflow attacks.

Bug: 31856351
Test: compile, unit tests, manual test

Change-Id: I194850a4c79ddf478d98e750f65b24e82d99ebc0