commit | 33a246829ed2f7e25c96ba4a1f6bbb68c9507830 | [log] [tgz] |
---|---|---|
author | nharold <nharold@google.com> | Tue Apr 18 22:10:17 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Tue Apr 18 22:10:17 2017 +0000 |
tree | a5af6033d21058571cde08f28985dd8755ea56e6 | |
parent | 21ec60f4dba6d237f1cb0aef215c0495f7fe7e4f [diff] | |
parent | bd6d169a27e05b04aa8e90cc08509b41736a431a [diff] |
Merge "Remove DatagramSocket calls from IpSecManagerTest" am: 40fe746f16 am: 335800627b am: bd6d169a27 Change-Id: I30fdb54469197c040cc5ad2e91bde4e9a9e86d41