| commit | 8caa274ade59df3ed75a08bcec4a40ef5edad5f2 | [log] [tgz] |
|---|---|---|
| author | Benedict Wong <benedictwong@google.com> | Tue Dec 19 00:16:29 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 19 00:16:29 2017 +0000 |
| tree | cc5373bf91897a5e34e2c97ed5e21c4f1012a477 | |
| parent | 99be302c7191f07fbc75a8031c46ef382a9da546 [diff] | |
| parent | d0ac50bcadfb3b2472351d581d7f3b25702d6c55 [diff] |
Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am: d0ac50bcad Change-Id: If2f71108d0c3d5742ee39b041f5fa886aac820cb