tree d90950105b10fa1be51c5af3d2479da8c34c47ba
parent ec92a52eca524ae2993e3564166cea32a0f3b41b
author Tom Turney <tturney@google.com> 1421199964 +0000
committer Tom Turney <tturney@google.com> 1421199964 +0000

DO NOT MERGE: Revert "Revert "Cherry pick:
Update sl4a according to WifiScannerManager changes. https://googleplex-android-review.git.corp.google.com/#/c/576209""

This reverts commit 310cdc8a347dd2a2970da95369a5af4051353ab6.

Change-Id: Ib8af9ec4f2c7f8fb9b5c86df6f6a07c642d5d25c