OSDN Git Service

Merge changes I4c26aea7,I79911434 into pi-dev
authorNathan Harold <nharold@google.com>
Wed, 21 Mar 2018 20:59:02 +0000 (20:59 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 21 Mar 2018 20:59:02 +0000 (20:59 +0000)
commit095b9e8e1c58393bac6e5f409ab73fe91cc15263
treeb11a68b35233f703af99f914ed7440d02bf9ee7f
parent025cb0c392b623038bea3e1b0a59dc0c17eb1bef
parent82485a2660b8eb3689021889f68b7e6e199a31c4
Merge changes I4c26aea7,I79911434 into pi-dev

* changes:
  Check mOwnedByTransform to avoid DELSA on SPI
  Expose add/removeAddress for IpSecInterfaces
api/system-current.txt
services/core/java/com/android/server/IpSecService.java