bad2

bad2
Merge branch 'android_ym2' of https://github.com/GritBear20/facefuuuun into android_ym2