tree a70660353b73ba0052806ac82c1a676a955bff99
parent 64247a1661c4152ccd791bb82bb3a38ca8ba0c8e
parent f180b09492e16af8ad76eae1d90aa64e66c23f75
author Roshan Pius <rpius@google.com> 1569499399 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1569499399 +0000

Merge changes from topics "scanner_multiple_sta", "sta_sta_same_bands"

* changes:
  WifiScanner: Add missing @hide constants
  WifiScanner: Add support to add more results to ScanData