| commit | 9de5c7730390ebb1bc399cfd4a449c9da502b325 | [log] [tgz] |
|---|---|---|
| author | Benedict Wong <benedictwong@google.com> | Tue Dec 19 00:27:57 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Tue Dec 19 00:27:57 2017 +0000 |
| tree | 99afd1d932794ae9ad4779a18b3fd02053ddd26d | |
| parent | fe9e89820d08c49f8305c734de0a707bf0b10feb [diff] | |
| parent | 8caa274ade59df3ed75a08bcec4a40ef5edad5f2 [diff] |
Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am: d0ac50bcad am: 8caa274ade Change-Id: I2f27c76a1f493ff4f0bd423c06f159e629866d4d