tree 8547e3b34f360b66d98648f437aa6bebcd7129ae
parent dfe5f234a205a76e8a3962a901d4193e222c3ab5
parent 988256f6c383c2c6b24d295c2f2e7ce77ec9955f
author Roshan Pius <rpius@google.com> 1507079724 +0000
committer android-build-merger <android-build-merger@google.com> 1507079724 +0000

Merge "WifiConfigManager: Don't reset the userId on user stop" into oc-mr1-dev
am: 988256f6c3

Change-Id: Ifb0b6c12f71d637b73e658e8115bca98215e789a