合并分支

svn merge https://svn.baidu.com/app/search/fb/trunk/gushitong-android

cherry pick(要加入merge代码的分支)

svn -c reverion_number branch_reversion_from