tree 8b3561a37c8db77e230c8e3028b27ebbb4d4051b
parent cb1f254ec65954ff7585f40df4b38337c462b14c
parent 24cbd05c9477ab59cc5665989026b4ad17e06eb6
author Xiang, Haihao <haihao.xiang@intel.com> 1508829435 +0800
committer Xiang, Haihao <haihao.xiang@intel.com> 1508829808 +0800

Merge branch 'v2.0-branch' into master

Conflicts:
	configure.ac