OSDN Git Service

Merge changes from topic "ipsec-resource-id-cleanup" am: 2b36299c73
authornharold <nharold@google.com>
Mon, 8 Jan 2018 20:16:08 +0000 (20:16 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 8 Jan 2018 20:16:08 +0000 (20:16 +0000)
commita07d0e463d8493a9e0df49dd6946cf812c8ec848
tree09c1e5d6809f9c49b94f73a9b4b26f0dea0f3629
parent555e680089513599edcb2335c1e45d9dd7872857
parentd7319df4d076b63a4ce07ac362cae7b30aef36cf
Merge changes from topic "ipsec-resource-id-cleanup" am: 2b36299c73
am: d7319df4d0

Change-Id: If6ab575e2f30fc70d73e6f8787c87f3c7a2ab09d