update
Merge branch 'master' of https://github.com/wangym/zxing-client-android