OSDN Git Service

Merge "[DO NOT MERGE] Do not start the IpSecService" into oc-dev
authorNathan Harold <nharold@google.com>
Wed, 24 May 2017 21:36:15 +0000 (21:36 +0000)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Wed, 24 May 2017 21:36:19 +0000 (21:36 +0000)
commit72cdc9cdae6891cc64ad49920106cd15602ba607
treee6a31e7e7ba8a2476f46ef2119d9326a90865a78
parent4e962321ad30709d04ca23e59aec26015d3a39a3
parent41004ff4113dc9175c993638a47af602af6d8a98
Merge "[DO NOT MERGE] Do not start the IpSecService" into oc-dev