tree 8bc595678bef3963ee79283ea8414b702f7c1cb3
parent 5d147a64e0bb852442586dbf1bed906683494412
parent a51a70c55c45812c85cd4271d099e4a8d2759a6e
author Ben Fennema <fennema@google.com> 1472504305 +0000
committer android-build-merger <android-build-merger@google.com> 1472504305 +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: 5f5a2ba657  -s ours am: 96bc190e30  -s ours am: 332a9777fd  -s ours am: c81700d3e9  -s ours
am: a51a70c55c  -s ours

Change-Id: Ia16bc4cd23aba6534c8fe7e3a5b2dc06aa337708