OSDN Git Service

Merge "Use consistent naming for allocating SPI."
authornharold <nharold@google.com>
Thu, 14 Dec 2017 21:10:16 +0000 (21:10 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 14 Dec 2017 21:10:16 +0000 (21:10 +0000)
commitbf48afea49f616f4def5b802b54cb313289a0c7f
tree7fe6818a5f19784869bcbe18f82cc4af038c0c81
parent3adfec2de3176b575a8e7affc4fc30103ae2fa2f
parent5fb929032de14ca78163e1d0c42c34f6fb287da4
Merge "Use consistent naming for allocating SPI."
api/current.txt
services/core/java/com/android/server/IpSecService.java
tests/net/java/com/android/server/IpSecServiceParameterizedTest.java
tests/net/java/com/android/server/IpSecServiceTest.java