Merge pull request #930 from sva-img/develop
authorZhang Xianyi <traits.zhang@gmail.com>
Fri, 22 Jul 2016 15:42:30 +0000 (11:42 -0400)
committerGitHub <noreply@github.com>
Fri, 22 Jul 2016 15:42:30 +0000 (11:42 -0400)
P6600/I6400 Build fix.


Trivial merge