ADFA
Merge branch 'master' of https://github.com/jjyo/android

sdf