tree c354beb93988cd03b4a144b1808337f60cfbd713
parent dea0438385393d9dab1579823b79e413c6e22f3b
parent f706fe2f6000d0d7c132c17e622cb96e8eaabc4c
author Jerry Zhang <zhangjerry@google.com> 1494353423 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1494353430 +0000

Merge "Always force set functions on disconnect" into oc-dev