| commit | ebf59a896246b9b1603b779029c213f69d8875d4 | [log] [tgz] |
|---|---|---|
| author | Benedict Wong <benedictwong@google.com> | Tue Dec 19 00:41:55 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 19 00:41:55 2017 +0000 |
| tree | 184e45345d58b5c993e9cf82dbefe5bc6bb1592b | |
| parent | 4316d8ecdee8350bd9becc2de6615cb389d0153a [diff] | |
| parent | 9de5c7730390ebb1bc399cfd4a449c9da502b325 [diff] |
Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am: d0ac50bcad am: 8caa274ade am: 9de5c77303 Change-Id: I4140f386687c579044f9b5fe59dd7e05f86000fe