| commit | d9814db6c843b8b0d0d118e568d00bc6f4f36f44 | [log] [tgz] |
|---|---|---|
| author | Neil Fuller <nfuller@google.com> | Wed Jun 11 19:26:24 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Jun 11 19:26:24 2014 +0000 |
| tree | 69041d36d8eb5b8d1a550d925701515f8d6b0c9b | |
| parent | 07faf03b116fc5ce7b03a4f5404b20f54da73540 [diff] | |
| parent | 87afdd830fe1d4d68f7be04560fde4550a1873e8 [diff] |
am 87afdd83: am c47c0f72: Merge "Fix DatagramMulticastChannelTest so it works better on hammerhead" * commit '87afdd830fe1d4d68f7be04560fde4550a1873e8': Fix DatagramMulticastChannelTest so it works better on hammerhead