| tag | 610588be2865e062dfa57c4a73263327ebd14742 | |
|---|---|---|
| tagger | The Android Open Source Project <initial-contribution@android.com> | Thu Feb 02 12:33:08 2017 -0800 |
| object | 96d8d99759aca7ce43a12481465d5911388ae261 |
Android 7.0.0 Release 28 (NBD91Y)
| commit | 96d8d99759aca7ce43a12481465d5911388ae261 | [log] [tgz] |
|---|---|---|
| author | Ningyuan Wang <nywang@google.com> | Tue Oct 11 11:42:12 2016 -0700 |
| committer | The Android Automerger <android-build@android.com> | Thu Oct 27 15:24:54 2016 -0700 |
| tree | 7768c740a7b5f94dcb2e063ff729deb10cb0f08c | |
| parent | fa8f7e433abcb05bd3fd96ae7d4dae42c482bf06 [diff] |
resolve merge conflicts of 849c5c7 to mnc-dev Merge into nyc-release 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 (cherry picked from commit 18b64538760877d2775a80e81e193d8fe96a66c9)