tree 5996000762795f180928d2f1d16e6e1689d45ebd
parent bef58daefbccf81df1a6b7a9a2d103cee7819d69
parent f12262368afe3219b28dbac3bf86939239709abe
author Mitchell Wills <mwills@google.com> 1467052117 +0000
committer android-build-merger <android-build-merger@google.com> 1467052117 +0000

Merge \\"Add a WifiScanner API to listen for ongoing scans\\" into nyc-mr1-dev am: 450fee26a2
am: f12262368a

Change-Id: I159d7a82a9cf965b90284174c635090ee8704c26