OSDN Git Service

Merge branch 'v1.6-branch' into master
authorXiang, Haihao <haihao.xiang@intel.com>
Wed, 8 Jul 2015 00:31:04 +0000 (08:31 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Wed, 8 Jul 2015 01:20:34 +0000 (09:20 +0800)

Trivial merge