commit | 30775693ec452ff04f909ba370a15e6ab879fb68 | [log] [tgz] |
---|---|---|
author | Nathan Harold <nharold@google.com> | Wed Apr 19 01:06:55 2017 +0000 |
committer | android-build-merger <android-build-merger@google.com> | Wed Apr 19 01:06:55 2017 +0000 |
tree | 11ec353269dff76ebd87f39978434fc47139f88c | |
parent | 15a9d5b7404cf8450371049782db1bf6a0421d9a [diff] | |
parent | 92a7123377128c6185bcec8e562b6c85fb2fa009 [diff] |
Merge "Remove DatagramSocket calls from IpSecManagerTest" into oc-dev am: d017754253 am: 92a7123377 Change-Id: I2d9107c6e50ba94f9bfe39bfbcb79c1a5390f0a6