| commit | 0c3afc1159f36e96bcfc9564f733de1e1ff478fa | [log] [tgz] |
|---|---|---|
| author | Robert Greenwalt <rgreenwalt@google.com> | Fri May 24 09:24:32 2013 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri May 24 09:24:32 2013 -0700 |
| tree | 35e63eb4562d505b5bfcea6eb91a1d9ab6d61f74 | |
| parent | b69e58df12d28c03d7e2138653be21be1f19ad2d [diff] | |
| parent | 4398f34e478754975cea606b85e106aed93a5fd2 [diff] |
am 36a151ab: Merge "Use the old interface when resetting connections" into jb-mr2-dev * commit '36a151abcd794524358a74599a1f4ab130ca7b55': Use the old interface when resetting connections