Merge "Use WifiAnnotations instead of ScanResult for annotations" into rvc-dev
tree: b4b9cf25ef1cf0ad214168df5c96283b9d639920
  1. apex/
  2. service/
  3. PREUPLOAD.cfg