OSDN Git Service

Merge "Change reserveSecurityParameterIndex() to take a remoteAddress" am: d118826971
authorNathan Harold <nharold@google.com>
Thu, 30 Mar 2017 03:44:12 +0000 (03:44 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Mar 2017 03:44:12 +0000 (03:44 +0000)
commit81d48a99e03873d8b77aa1c26a749a561462471a
tree442e24c298afc0345057a6ee4cdbaccf4597da41
parentc809a5b12bca64affa0899f70bdd17cd6f9d5246
parent6d3c10495e2eecc153e42322f2fb1b3e573f7c2f
Merge "Change reserveSecurityParameterIndex() to take a remoteAddress" am: d118826971
am: 6d3c10495e

Change-Id: If826b05dea2d3c14137ee5e34449b6d39af6cc10