tree 533142f98291fe8ef96891d69d37bc6acdb303a3
parent 332a9777fdbb35a674c0b622883d8f4f53c31026
parent 06a3b490636d11c3d1fa146f69af0a01c1bb97f8
author Ben Fennema <fennema@google.com> 1461029448 +0000
committer android-build-merger <android-build-merger@google.com> 1461029448 +0000

DO NOT MERGE ANYWHERE Fix max number of sched scan SSIDs based on driver capability am: 0fbcc4cde5  -s ours am: 0261db291a  -s ours am: e00d5291c6  -s ours am: e6f65bc1ec  -s ours
am: 06a3b49063  -s ours

* commit '06a3b490636d11c3d1fa146f69af0a01c1bb97f8':

Change-Id: I8e53194fd531f48db46b09e6d22c1ba6800a77e4