Handle conflicts from git merge release-20160315
[platform/upstream/mic.git] / tools /
drwxr-xr-x   ..
-rwxr-xr-x 12567 mic