OSDN Git Service

Merge "[DO NOT MERGE] Do not start the IpSecService" into oc-dev am: 72cdc9cdae
authorNathan Harold <nharold@google.com>
Wed, 24 May 2017 22:09:57 +0000 (22:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 24 May 2017 22:09:57 +0000 (22:09 +0000)
commite1612d04de3bef0e970165ea80aebb6fba392240
tree76edccb4b3007639e81d9bddb47b8258af6db106
parent9a99745428f32e75b7a944d02685206ca7afd01c
parent6bebfa708db1cbaf295c76f57f75ada2c5b38544
Merge "[DO NOT MERGE] Do not start the IpSecService" into oc-dev am: 72cdc9cdae
am: 6bebfa708d

Change-Id: I5cb366480533afdb767144d760198d8ddfaa3dbd
services/java/com/android/server/SystemServer.java