filler
resolved merge
Merge branch 'android' of https://github.com/rayoung/fydp into android
evans changes