| commit | b2f17f1bbb948b61d7a2b111b89891e34fe65c16 | [log] [tgz] |
|---|---|---|
| author | Rebecca Silberstein <silberst@google.com> | Wed Jun 29 20:15:59 2016 +0000 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Jun 29 20:16:01 2016 +0000 |
| tree | fec874a33352e9518900e7a27cf346c94c74f38a | |
| parent | 8a17a77e4b07b020a6cc287af1a4de0da0ecc36a [diff] | |
| parent | 0dbeb9e01a7041cbee61b8db7eb8d7562c2a3e6c [diff] |
Merge changes from topic 'cherrypickWifiWatchdogResetOnTrigger' into nyc-mr1-dev * changes: DO NOT MERGE StateMachine: remove final from SendMessage DO NOT MERGE WifiManager: add WIFI_MODE_NO_LOCKS_HELD