OSDN Git Service

Merge remote-tracking branch 'fdo/v1.6-branch' into fdo--master
authorXiang, Haihao <haihao.xiang@intel.com>
Thu, 3 Mar 2016 05:00:43 +0000 (13:00 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Thu, 3 Mar 2016 05:00:43 +0000 (13:00 +0800)

Trivial merge