OSDN Git Service

Merge remote-tracking branch 'fdo/v1.7-branch' into fdo--master
authorXiang, Haihao <haihao.xiang@intel.com>
Thu, 17 Mar 2016 00:58:06 +0000 (08:58 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Thu, 17 Mar 2016 00:58:06 +0000 (08:58 +0800)

Trivial merge