OSDN Git Service

Merge branch 'v2.1-branch' into master
authorHaihao Xiang <haihao.xiang@intel.com>
Thu, 8 Mar 2018 05:20:32 +0000 (13:20 +0800)
committerHaihao Xiang <haihao.xiang@intel.com>
Thu, 8 Mar 2018 06:17:55 +0000 (14:17 +0800)

Trivial merge