tree b8c8703c09a2eda02a83f0f2a5e1b80c38c0092b
parent b987170762b490360a17eee9c004237bbf2d8028
parent 332a9777fdbb35a674c0b622883d8f4f53c31026
author Ben Fennema <fennema@google.com> 1472501356 +0000
committer android-build-merger <android-build-merger@google.com> 1472501356 +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

Change-Id: I594aac4620bcdd8489a2e4e63ec98cc196c3b195