tree f578c3f0358026578af66d5736d71b073a0d99db
parent 719b6ae422910df0c17ae36deba0acc08d9a8943
parent 6ecc9ff41652d29b6f5a8e8b1771dc673b0bf29a
author Rebecca Silberstein <silberst@google.com> 1527110948 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1527110948 +0000

Merge changes I790baf5e,I133f4861 into pi-dev

* changes:
  WifiStateMachinePrime: discard messages from old managers
  ModeManagers: do not report disabled when stopped