[automerger skipped] WifiConfigStore: Store integrity data in same file am: 01b1ad1d2f -s ours
am: 4d11c12efd -s ours
am skip reason: change_id I528d3402cb047cca3793be5f1386c4bb60c39a10 with SHA1 829750e67d is in history

Change-Id: I7e8fb834be1702b495b8ffe56185b0c73bc9fed2
tree: f9064ef436d51e612d626daca2ae658336be8f3d
  1. service/
  2. PREUPLOAD.cfg