Merge "Add ScanResultInfo in the ProvisioningConfiguration parcelable." am: 009b730313

Change-Id: Ib9516ed24b6c6274c72ff1c06e635c6f021febff
tree: 546b64f1a36b8c48d35fffb94555ae4046609573
  1. service/
  2. PREUPLOAD.cfg