tree 235d8a92ee4185576a2d4d46eeb4e5e76dc19d1b
parent dbaf29e09adbf2e44a598438fa8ad38f70c47b5b
parent 7cede48303b0faabb3b6861a1ac7229f76fca006
author Roshan Pius <rpius@google.com> 1506723222 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1506723222 +0000

Merge changes I38c31645,Ib6f61b81 into oc-mr1-dev

* changes:
  WifiStateMachine: Handle WifiManager.save() when wifi is off
  NetworkListStoreData: Set creatorUid for all networks on load