| commit | 50a0959835100823848d9476bc3c5cad5a34bc92 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Mon Jun 16 12:43:07 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 16 12:43:07 2014 +0000 |
| tree | 28c7a656fb4703506bc741fcb121846f386382cd | |
| parent | 324bf991656e86dce9a58c82123d4b0390a393b5 [diff] | |
| parent | 4a35ec7e9eacc403a904d83df09a7bd762ebec0f [diff] |
am 4a35ec7e: am 2b931177: Merge "Tidy up MulticastSocketTest and fix execution on hammerhead" * commit '4a35ec7e9eacc403a904d83df09a7bd762ebec0f': Tidy up MulticastSocketTest and fix execution on hammerhead