tree 0d2df0d2ecd10ea6824557b4a1d62bdac1c110eb
parent 34a7cdc8ceb2d767a642d013914e681e21979987
parent ccff03d196f460963d41079abee28417fe72a9e7
author Tao Bao <tbao@google.com> 1528308422 -0700
committer android-build-merger <android-build-merger@google.com> 1528308422 -0700

Merge "ui: join only if joinable." am: 2454b2493a
am: ccff03d196

Change-Id: I6752eaf96637a9263eb49caa5322a815a6208ef5