commit | 7320b00a82b1a843362b55a19646d3d1ca19cd93 | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Fri May 12 20:10:18 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Fri May 12 20:10:19 2017 +0000 |
tree | 32287d6091e2921a89d8e9ecafc5771be68da285 | |
parent | ffc457e3aaa0a8713b5f35e3af04dbe764ad6a30 [diff] | |
parent | 3952b5d4b21bfb08ac756e1cc1f9915c5bc3bdbd [diff] |
Merge "Do not cancel scan timeout alarm on PNO scan result" into oc-dev