| commit | f052469c7b706365f83cc8936cebdedb195eebf6 | [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 | 1ff0fad207eb6e6a87fe29684ed2678de88f9266 [diff] | |
| parent | a2db7676f3b7ea729394b8540ee06571e9fc0d7d [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.