| commit | bd6d169a27e05b04aa8e90cc08509b41736a431a | [log] [tgz] |
|---|---|---|
| author | nharold <nharold@google.com> | Tue Apr 18 22:00:45 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 18 22:00:45 2017 +0000 |
| tree | 4a74ad3ce76630a7630c3ccbae0169b2ef97fb22 | |
| parent | 02bf062557d97e74934b2efb362d1ea86992b0a1 [diff] | |
| parent | 40fe746f169fbfb33fb2eec49f43acea5419fc48 [diff] |
Merge "Remove DatagramSocket calls from IpSecManagerTest" am: 40fe746f16 am: 335800627b Change-Id: I276c35e350be82b01f68c260a39e7b33bab619c1