tree 9c83663f341d029128f42667acfed124795d50ba
parent 64c73853380f1c1455ca6003bfb6798b49ebe4bd
parent f229354f18daeb1f4e3fc91bf0df0382daa8fe86
author Jack Yu <jackyu@google.com> 1493273088 +0000
committer android-build-merger <android-build-merger@google.com> 1493273088 +0000

Merge "Fixed that disconnect message not showing up" am: 2fc6f67431
am: f229354f18

Change-Id: If62437bc35466a5d6b5f53ec37ecaa64388de539