Merge branch 'master' of https://github.com/OAID/caffeOnACL
authorxuhaibing <hxu@openailab.com>
Thu, 6 Jul 2017 15:37:29 +0000 (23:37 +0800)
committerxuhaibing <hxu@openailab.com>
Thu, 6 Jul 2017 15:37:29 +0000 (23:37 +0800)

Trivial merge