OSDN Git Service

Merge changes from topic "re-enable-ipsec"
authornharold <nharold@google.com>
Tue, 26 Sep 2017 21:46:39 +0000 (21:46 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 26 Sep 2017 21:46:39 +0000 (21:46 +0000)
commit680525c742efef83edc48033ba0ca634ad371e11
treed5c8d357e5219118511867694ef88d5a6b04ff12
parentb9e2ddfc10c30b80ada4756d7401b715ebfa0fc5
parentd999d225a8ebd5662b61d7f67bb402d8e5cb965b
Merge changes from topic "re-enable-ipsec"

* changes:
  Re-Expose IpSecService API Surface
  Re-Enable Starting of the IpSecService
api/current.txt
api/system-current.txt
api/test-current.txt
services/java/com/android/server/SystemServer.java