| commit | 4a35ec7e9eacc403a904d83df09a7bd762ebec0f | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Mon Jun 16 12:38:45 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Jun 16 12:38:45 2014 +0000 |
| tree | 2a9f47b4d1324c739cf09db258b3bb3abae426cd | |
| parent | 9e8e91cd9808d4d5d959743bcd96d2c30b9e9ef4 [diff] | |
| parent | 2b9311770bc531f15edb43f382696f3954a7c4e8 [diff] |
am 2b931177: Merge "Tidy up MulticastSocketTest and fix execution on hammerhead" * commit '2b9311770bc531f15edb43f382696f3954a7c4e8': Tidy up MulticastSocketTest and fix execution on hammerhead