# Conflicts:
#	src/operators/op_param.h
#	tools/op.cmake

fix #489 create ios folder, add design doc add, ios development doc

fix #485 conv add bn relu op , todo more

#482 Dockerfile 自动下载 ndk-r17

optimize depthwise_conv 3x3s2

# Conflicts:
#	src/common/types.h

fix #472 Dockerfile use ubuntu:16.04, update CMakeList.txt