tree f9064ef436d51e612d626daca2ae658336be8f3d
parent 7400da9bd3ec7b725b04b50516dac59bd6fe3bb5
parent 01b1ad1d2f2b68dcf11a4acbeee884094ea610a3
author Roshan Pius <rpius@google.com> 1566003242 -0700
committer android-build-merger <android-build-merger@google.com> 1566003242 -0700

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

Change-Id: I66e1a40d3a209bbddbebc6c283b05a5b848abf0d