Merge "Reset single scan timestamp when disabling Wifi" into nyc-dev
am: bcb882b117

* commit 'bcb882b11790c1f4d64a78a0e0cb07dd0c227c6c':
  Reset single scan timestamp when disabling Wifi

Change-Id: I8b1476fb4e79de2624c11bdd63bde3f443034a47
tree: edf420bea3615a84420f775748a7a347df37bb21
  1. service/
  2. tests/