android: button2 works
Merge branch 'button2' of github.com:tonglil/zap into button2