test
add a line
add android note
Merge branch 'master' of https://github.com/tsingyixy/Diamond