| commit | 15a9d5b7404cf8450371049782db1bf6a0421d9a | [log] [tgz] |
|---|---|---|
| author | nharold <nharold@google.com> | Tue Apr 18 22:22:23 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Apr 18 22:22:23 2017 +0000 |
| tree | 11ec353269dff76ebd87f39978434fc47139f88c | |
| parent | 712aa0495b7dda282b4c423bd6eb3d371097cd54 [diff] | |
| parent | 33a246829ed2f7e25c96ba4a1f6bbb68c9507830 [diff] |
Merge "Remove DatagramSocket calls from IpSecManagerTest" am: 40fe746f16 am: 335800627b am: bd6d169a27 am: 33a246829e Change-Id: Ic2aa4b9e5bd48f8067a2132aa361e4f1f89f3fd0