sth. wrong
drawable add xml
Merge branch 'master' of https://github.com/runyetech/find-android

Conflicts:
	src/com/google/zxing/client/android/CaptureActivity.java
	src/com/google/zxing/client/android/FinishListener.java
	src/com/google/zxing/client/android/LocaleManager.java
	src/com/google/zxing/client/android/ScanFromWebPageManager.java
	src/com/google/zxing/client/android/clipboard/ClipboardInterface.java
	src/com/google/zxing/client/android/encode/EncodeActivity.java
	src/com/runyetech/find2/main/DistFragment.java
	src/com/runyetech/find2/main/MainActivity.java
	src/com/runyetech/find2/main/MyFindFragment.java
	src/com/runyetech/find2/mostvalue/MostValueActivity.java
what's wrong
Merge branch 'master' of https://github.com/runyetech/find-android.git

Conflicts:
	gen/com/runyetech/find2/R.java
	res/layout/view_mostvalue_list_item.xml