| commit | 2bd5d2d8f173daa6ccdca303a3ddfb050b151e7f | [log] [tgz] |
|---|---|---|
| author | Lorenzo Colitti <lorenzo@google.com> | Wed May 28 21:44:50 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed May 28 21:44:50 2014 +0000 |
| tree | 9932c5ad443d310e090c766ad82ec8713b379c76 | |
| parent | 34648fc64d8b2988c8c0e5eef68cc432c35aad97 [diff] | |
| parent | 892331dc0852131f29715b7ae91308c43325e2ee [diff] |
am d925573a: (-s ours) Merge "DO NOT MERGE - Support disconnecting while trying to connect." into lmp-preview-dev * commit 'd925573af1ceab0d4a447e738f1d8830e552edd1': DO NOT MERGE - Support disconnecting while trying to connect.