Merge branch 'master' of https://github.com/OAID/caffeOnACL
authorYao Honggui <honggui@openailan.com>
Fri, 2 Jun 2017 12:34:17 +0000 (20:34 +0800)
committerYao Honggui <honggui@openailan.com>
Fri, 2 Jun 2017 12:34:17 +0000 (20:34 +0800)
# Conflicts:
# LICENSE


Trivial merge