OSDN Git Service

Merge changes Ic0515cec,If547bd96 into pi-dev
authorOscar Shu <xshu@google.com>
Fri, 6 Apr 2018 20:17:40 +0000 (20:17 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 6 Apr 2018 20:17:40 +0000 (20:17 +0000)
commitbc73b3b6e91e47e64a3c50d7c0c8113fa4f66601
treeb642d0893511524b90e8ccc798f827bc22072a8e
parent086633e03db1c0f12eec6ae15bdf39b3fc05e0d2
parent39cef4d9b62cd7990a9d596a681874424fe8f1b8
Merge changes Ic0515cec,If547bd96 into pi-dev

* changes:
  metrics: identifying dfs from non dfs scans
  metrics: watchdog connection delay field
proto/src/wifi.proto