| commit | 27fc131752a0742318d2c952e8ac64635dbb6990 | [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 | 530460601e7da8b3795ecfb4f034f014a483dd91 | |
| parent | c887ace09017aa7757cbae05e6f39ecfc2e62a64 [diff] | |
| parent | 6e4c4f47eaf509d4c0a8a1af39b4b5f3c84a9098 [diff] |
Merge "Make NETWORK_SETTINGS trump CHANGE_WIFI_STATE" into pi-dev