| commit | f7896f491a9529cc6658dac9f2d92b0643abe372 | [log] [tgz] |
|---|---|---|
| author | Sarah Fortune <sfortune@google.com> | Mon Apr 17 20:07:31 2017 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Mon Apr 17 20:07:32 2017 +0000 |
| tree | bda21be72d4cb9382686969df28edb09d63cba5e | |
| parent | 3265c258618317b08d4af3725eac9166e80f246c [diff] | |
| parent | 15d1e2676c615644d4b82df26950f3515e1ca640 [diff] |
Merge "Disable the wifi wakeup preference when wifi scanning is disabled" into oc-dev