tree fec874a33352e9518900e7a27cf346c94c74f38a
parent 8a17a77e4b07b020a6cc287af1a4de0da0ecc36a
parent 0dbeb9e01a7041cbee61b8db7eb8d7562c2a3e6c
author Rebecca Silberstein <silberst@google.com> 1467231359 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1467231361 +0000

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