| commit | c04b43461b80ceb1ecd035d17b88ebd89fa82219 | [log] [tgz] |
|---|---|---|
| author | Narayan Kamath <narayan@google.com> | Fri Dec 05 10:21:31 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Dec 05 10:21:31 2014 +0000 |
| tree | c36f5c52cec3bd61b5c7ea9187544c741befbbff | |
| parent | e2ffb329440774b5c30b1e30386b9b404aa4051e [diff] | |
| parent | 89b456da4190576d2c89ad01bd5a7627b0676c2c [diff] |
am 89b456da: Merge "Fix failing socket tests." * commit '89b456da4190576d2c89ad01bd5a7627b0676c2c': Fix failing socket tests.