Merge "taimen-wifi: adjust the keep alive time to 60 secs am: 7fe31f3934 am: 8569c582b1" into oc-mr1-dev-plus-aosp

This commit is contained in:
Android Build Merger (Role)
2017-08-02 20:55:18 +00:00
committed by Android (Google) Code Review

Diff Content Not Available