tree 4dd2a309743723d530d9b821d8f92a979a1b7a7b
parent 21b75414ce0ccc87c26e075edcd1ff9f69bd517f
author Yunpeng Zhang <zyp8884625@gmail.com> 1503011263 -0400
committer Yunpeng Zhang <zyp8884625@gmail.com> 1503011263 -0400

Fixed conflict, rename vSGW to vSGWC

Change-Id: I68405395edeedd305b43c0dfd9a85f46f582122d