tree 1b0ab0ef319bfad5068414a169ba7e6684832332
parent 5a389e7e44c37d78d19c9c4b4d3ded316a9ff36f
parent 281fae21f82c3a9d2b9aa613a07f2f38584e5dc7
author Peter Qiu <zqiu@google.com> 1486064571 +0000
committer android-build-merger <android-build-merger@google.com> 1486064571 +0000

Merge "wifi: WifiConfiguration: add isHomeProviderNetwork field" am: e724f82b3d
am: 281fae21f8

Change-Id: I1baeb7afdff6fbc399ab16ef7aa266506ef7aacb