Commit 3d73904fa1c534c86c841cc41aad2744307bfdf2

Authored by Zhao Shuaihua
2 parents 473215b4 bf29393c

Merge branch 'dev-shzhao' of 192.168.10.182:ming/vpt_ascend_arm into dev-shzhao

src/decoder/Makefile_face 100644 → 100755