delete
modify
modify error
Merge branch 'master' of github.com:semious/alipay-demo-client

Conflicts:
	android/bin/classes/com/alipay/client/net/HttpRequestBuilder.class
	android/bin/classes/com/alipay/client/quickdemo/BarcodeCaptureActivity.class
	android/bin/classes/com/alipay/client/quickdemo/CameraActivity.class
	android/bin/classes/com/alipay/client/quickdemo/DemoListActivity$2$1.class
	android/bin/classes/com/alipay/client/quickdemo/DemoListActivity$DownZipThread.class
	android/bin/classes/com/alipay/client/quickdemo/DemoListActivity.class
	android/bin/classes/com/alipay/client/quickdemo/DesignListActivity$1$1.class
	android/bin/classes/com/alipay/client/quickdemo/DesignListActivity.class
	android/bin/classes/com/alipay/client/quickdemo/IDLActivity.class
	android/bin/classes/com/alipay/client/quickdemo/ImageDetailActivity.class
	android/bin/classes/com/alipay/client/quickdemo/ImageListActivity$1.class
	android/bin/classes/com/alipay/client/quickdemo/ImageListActivity$2.class
	android/bin/classes/com/alipay/client/quickdemo/ImageListActivity$3.class
	android/bin/classes/com/alipay/client/quickdemo/ImageListActivity$4.class
	android/bin/classes/com/alipay/client/quickdemo/ImageListActivity$5$1.class
	android/bin/classes/com/alipay/client/quickdemo/ImageListActivity$5.class
	android/bin/classes/com/alipay/client/quickdemo/ImageListActivity$6$1.class
	android/bin/classes/com/alipay/client/quickdemo/ImageListActivity$6.class
	android/bin/classes/com/alipay/client/quickdemo/ImageListActivity$7.class
	android/bin/classes/com/alipay/client/quickdemo/ImageListActivity$8.class
	android/bin/classes/com/alipay/client/quickdemo/ImageListActivity$9.class
	android/bin/classes/com/alipay/client/quickdemo/ImageListActivity.class
	android/bin/classes/com/alipay/client/quickdemo/MainActivity$1.class
	android/bin/classes/com/alipay/client/quickdemo/MainActivity$2.class
	android/bin/classes/com/alipay/client/quickdemo/MainActivity$3.class
	android/bin/classes/com/alipay/client/quickdemo/MainActivity.class
	android/bin/classes/com/alipay/client/quickdemo/R$attr.class
	android/bin/classes/com/alipay/client/quickdemo/R$color.class
	android/bin/classes/com/alipay/client/quickdemo/R$dimen.class
	android/bin/classes/com/alipay/client/quickdemo/R$drawable.class
	android/bin/classes/com/alipay/client/quickdemo/R$id.class
	android/bin/classes/com/alipay/client/quickdemo/R$layout.class
	android/bin/classes/com/alipay/client/quickdemo/R$raw.class
	android/bin/classes/com/alipay/client/quickdemo/R$string.class
	android/bin/classes/com/alipay/client/quickdemo/R$style.class
	android/bin/classes/com/alipay/client/quickdemo/R.class
	android/bin/classes/com/alipay/client/quickdemo/SplashActivity$1.class
	android/bin/classes/com/alipay/client/quickdemo/WebViewActivity.class
	android/bin/classes/com/alipay/client/quickdemo/adapter/DemoChildListAdapter.class
	android/bin/classes/com/alipay/client/quickdemo/adapter/DemoListAdapter.class
	android/bin/classes/com/alipay/client/quickdemo/adapter/HtmChildListAdapter.class
	android/bin/classes/com/alipay/client/quickdemo/adapter/HtmListAdapter.class
	android/bin/classes/com/alipay/client/quickdemo/adapter/ImageListAdapter.class
	android/bin/classes/com/alipay/client/quickdemo/adapter/LoadStateManager$DownZipThread.class
	android/bin/classes/com/alipay/client/quickdemo/adapter/LoadStateManager.class
	android/bin/classes/com/alipay/client/quickdemo/data/Constant.class
	android/bin/classes/com/alipay/client/quickdemo/tools/FileUtils.class
	android/bin/classes/com/alipay/client/quickdemo/tools/HttpUtils.class
	android/bin/classes/com/alipay/client/quickdemo/tools/NetUtils.class
	android/bin/classes/com/alipay/client/quickdemo/tools/PicCache.class
	android/bin/classes/com/alipay/client/quickdemo/tools/PicUtils.class
	android/bin/classes/com/alipay/client/quickdemo/tools/SocketManager.class
	android/bin/classes/com/alipay/client/quickdemo/tools/ViewCreater.class
	android/bin/classes/com/alipay/client/quickdemo/view/MyListView.class
	android/bin/classes/com/etao/kaka/decode/KakaDecode.class
	android/bin/classes/com/google/zxing/client/BarCodeScanView.class
	android/bin/classes/com/google/zxing/client/CaptureActivityHandler.class
	android/bin/classes/com/google/zxing/client/ControllerView.class
	android/bin/classes/com/google/zxing/client/DecodeHandler.class
	android/bin/classes/com/google/zxing/client/ParseQrcodePictureHandler.class
	android/bin/classes/com/google/zxing/client/ViewfinderView.class
	android/bin/classes/com/google/zxing/client/camera/CameraConfigurationManager.class
	android/bin/classes/com/google/zxing/client/camera/CameraManager.class
	android/bin/jarlist.cache
	android/gen/com/alipay/client/quickdemo/R.java
	android/src/com/alipay/client/quickdemo/tools/SocketManager.java
	android/src/com/alipay/client/quickdemo/tools/ViewCreater.java