commit | f2eb6fbc0a9d000a2037d69e381c0784ccb847af | [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 | 9752eeb64f0f91597c69a5ccc27948578209def7 | |
parent | a44ff5034fc64aa9cf2cf288ff548b591518cd64 [diff] | |
parent | 36a151abcd794524358a74599a1f4ab130ca7b55 [diff] |
am 36a151ab: Merge "Use the old interface when resetting connections" into jb-mr2-dev * commit '36a151abcd794524358a74599a1f4ab130ca7b55': Use the old interface when resetting connections