OSDN Git Service

Merge branch 'v1.8-branch' into 01org--master
authorXiang, Haihao <haihao.xiang@intel.com>
Wed, 19 Apr 2017 04:21:08 +0000 (12:21 +0800)
committerXiang, Haihao <haihao.xiang@intel.com>
Wed, 19 Apr 2017 04:21:08 +0000 (12:21 +0800)
Conflicts:
configure.ac


Trivial merge