tree c76558370a5519c75aa940608c79aa1e5a3a65d7
parent e6f1ddce89a54e18fceb409acd5bdcd9d7b8c7d5
parent 9f750bf5f468e127c3286b4366751e124e74c3fe
author Mitchell Wills <mwills@google.com> 1467051801 +0000
committer android-build-merger <android-build-merger@google.com> 1467051801 +0000

Merge \"Add a WifiScanner API to listener for ongoing scans\" into nyc-mr1-dev
am: 9f750bf5f4

Change-Id: I24bb043b053fed51bd4d0d74214c50c6c351968c