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

Change-Id: I1eba17b33d5a1196a0066cd6a2709eb5043ef854
tree: b32371e0b49324e03a7701ef675e45b2eb38f196
  1. service/
  2. PREUPLOAD.cfg