tree b11a68b35233f703af99f914ed7440d02bf9ee7f
parent 025cb0c392b623038bea3e1b0a59dc0c17eb1bef
parent 82485a2660b8eb3689021889f68b7e6e199a31c4
author Nathan Harold <nharold@google.com> 1521665942 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1521665942 +0000

Merge changes I4c26aea7,I79911434 into pi-dev

* changes:
  Check mOwnedByTransform to avoid DELSA on SPI
  Expose add/removeAddress for IpSecInterfaces