commit e58d0ed2f2670c48374f7bd451432cb95dd161f8
author Android Build Merger (Role) <noreply-android-build-merger@google.com> Sat Aug 17 01:03:58 2019 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Aug 17 01:03:58 2019 +0000
tree f9064ef436d51e612d626daca2ae658336be8f3d
parent ae1ef78094df5ab1e5860c0f7fd6266a9f806eb3
parent 0f6322ea00d294480b804e00236912b41e699027

Merge changes from topic "am-5f19bbb7c4ed4dfcbca495ed6c37b56c" into qt-qpr1-dev-plus-aosp

* changes:
  [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
  [automerger skipped] Revert "WifiConfigStore: Limit integrity checks to single user devices" am: be9561c2b0 -s ours am: 7400da9bd3 -s ours am skip reason: change_id Iaee7746a3afc0fd6e80daa77ce5034e660261e8b with SHA1 820a9520b4 is in history