[automerger skipped] Merge "Add ScanResultInfo in the ProvisioningConfiguration parcelable." am: 009b730313 am: 87de8bc554 am: 7961f305a7 -s ours
am skip reason: Change-Id I60196e8e982a811c09745ab7d7ad006e689b970e with SHA-1 5fd5158335 is in history

Change-Id: I7eb4cf1a516f5e378502656df9d5fd81c61b3fa7
tree: 5e15884d170f4cab281991b51f652edec2bdb23a
  1. apex/
  2. service/
  3. PREUPLOAD.cfg