crean code following PMD and Findbugs
claen code space
Merge branch 'local' into develop
change test manifest
change target sdk
change test target
modify for unittest
modify for unittest
modify for unittest
merge