| commit | 73eacd638c9899e22dd7da5e45dacf27d053f55e | [log] [tgz] |
|---|---|---|
| author | Oscar Shu <xshu@google.com> | Tue Apr 24 17:11:09 2018 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 24 17:11:09 2018 +0000 |
| tree | e633529e6e77fd444faf90d4a5e1078cab0f20a5 | |
| parent | 81382b53fb9ce40032bb01e5b9831e71c7fe425b [diff] | |
| parent | 00c2b96960746c3da3cf4b249273285204c41fe5 [diff] |
Merge "Make NETWORK_SETTINGS trump CHANGE_WIFI_STATE" into pi-dev