OSDN Git Service

Merge changes from topic "ipsec-resource-id-cleanup"
authornharold <nharold@google.com>
Sat, 6 Jan 2018 17:29:12 +0000 (17:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 6 Jan 2018 17:29:12 +0000 (17:29 +0000)
commitd7319df4d076b63a4ce07ac362cae7b30aef36cf
tree6529bc0809d8d03e3b8b4b5680ac1de650362d5d
parent130d5e391512a8a9b8e193357621116372a2e6a7
parent2b36299c73f7ba853b5b3acf4ea58facb9d4922e
Merge changes from topic "ipsec-resource-id-cleanup"
am: 2b36299c73

Change-Id: I5461b0e0746f8c60b425126d9badbae4630395bb