更新自定义视图
Merge branch 'master' of https://github.com/jastrelax/android-foo