commit | 7c1f4d3c334ec1b79e01593d3c73e3edebb5193c | [log] [tgz] |
---|---|---|
author | TreeHugger Robot <treehugger-gerrit@google.com> | Wed Apr 19 23:16:26 2017 +0000 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Wed Apr 19 23:16:26 2017 +0000 |
tree | b5c5b35b0766dfb6eec972ebe5e9f4137e1a0ae8 | |
parent | 9c2477b53d4970375e51898b0aa3cba535e78dd5 [diff] | |
parent | e182f24d522c1fe5a9078c420a605ca5b9881724 [diff] |
Merge "Handle CMD_DISABLE_P2P_WATCHDOG_TIMER in default state" into oc-dev