commit | 073572a677d10bfbca6b02187adbec98e35e9cd9 | [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 | a8339a02695252860d5fe9fed67876fcf49945d4 | |
parent | 59dd893f9ed42946a1e1d56fba4fc17aa3cc0a80 [diff] | |
parent | cd534c6990ddd7d0a7648db1b84a94bc7cb0edf8 [diff] |
Merge "[ipsec-qtaguid] Tag sockets upon creation of encap sockets" am: cd534c6990 am: 8caa274ade Change-Id: I2f27c76a1f493ff4f0bd423c06f159e629866d4d