diff options
author | Rebecca Silberstein <silberst@google.com> | 2018-05-23 21:29:08 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2018-05-23 21:29:08 +0000 |
commit | 8b8c239ae1190a8055b378cfdb503df9823dba16 (patch) | |
tree | f578c3f0358026578af66d5736d71b073a0d99db /PREUPLOAD.cfg | |
parent | 719b6ae422910df0c17ae36deba0acc08d9a8943 (diff) | |
parent | 6ecc9ff41652d29b6f5a8e8b1771dc673b0bf29a (diff) |
Merge changes I790baf5e,I133f4861 into pi-dev
* changes:
WifiStateMachinePrime: discard messages from old managers
ModeManagers: do not report disabled when stopped
Diffstat (limited to 'PREUPLOAD.cfg')
0 files changed, 0 insertions, 0 deletions