| commit | 756c12404c00b116a18093516079995fd97a4adf | [log] [tgz] |
|---|---|---|
| author | Tao Bao <tbao@google.com> | Wed Jun 06 13:17:39 2018 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Jun 06 13:17:39 2018 -0700 |
| tree | 0d2df0d2ecd10ea6824557b4a1d62bdac1c110eb | |
| parent | 69fdcf5bacdbf2b3f6b29150a2eae2cc5ad4df4e [diff] | |
| parent | b4aad37e2102ef1685f9cb19d842d7c8293e3644 [diff] |
Merge "ui: join only if joinable." am: 2454b2493a am: ccff03d196 am: b4aad37e21 Change-Id: I13bc78cf0209b586181b00bc13f642a2e68c3e3d