| commit | f59170d1513903dc4b117c56d869ad215091378f | [log] [tgz] |
|---|---|---|
| author | Ningyuan Wang <nywang@google.com> | Tue Oct 11 11:42:12 2016 -0700 |
| committer | Adam Seaton <aseaton@google.com> | Thu Nov 03 11:04:36 2016 -0700 |
| tree | a6e4907eaab7c861a026e7a5d9aaf2cbca6e8052 | |
| parent | ef5fc441b6b12818762b6d77ea8054863263cf99 [diff] |
resolve merge conflicts of 849c5c7 to mnc-dev merge into mmr3 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