Merge pull request #29 from DIdiHL/zhaoyue

Zhaoyue
working on camera hardware
for merge
move fileName in caputureSetting
Merge pull request #30 from DIdiHL/mia

move fileName to CaptureSetting
Merge
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into zhaoyue

Merge
Using the library, all code delted