cd
Merge branch 'master' of https://github.com/airshiplay/android
add  adapter

Signed-off-by: airshiplay <airshiplay@126.com>