wifi direct forder add

aa
Merge branch 'master' of https://github.com/object0814/AssistApp

Conflicts:
MainActivity/bin/MainActivity(fi1).apk
MainActivity/bin/R.txt
MainActivity/bin/classes.dex
MainActivity/bin/classes/com/actionbarsherlock/R$attr.class
MainActivity/bin/classes/com/actionbarsherlock/R$id.class
MainActivity/bin/classes/com/actionbarsherlock/R$styleable.class
MainActivity/bin/classes/com/example/main/BaseActivity.class
MainActivity/bin/classes/com/example/main/Fragment1.class
MainActivity/bin/classes/com/example/main/Fragment2.class
MainActivity/bin/classes/com/example/main/MainActivity.class
MainActivity/bin/classes/com/example/switchbutton/SwitchButton.class
MainActivity/bin/classes/com/example/topviewbitmap/MainActivity.class

MainActivity/bin/classes/com/example/wifidirect/DeviceDetailFragment.cla
ss

MainActivity/bin/classes/com/example/wifidirect/DeviceListFragment$WifiP
eerListAdapter.class

MainActivity/bin/classes/com/example/wifidirect/DeviceListFragment.class

MainActivity/bin/classes/com/example/wifidirect/WifiDirectActivity.class
MainActivity/bin/classes/com/tagworld/slidingmenu/R$attr.class
MainActivity/bin/classes/com/tagworld/slidingmenu/R$id.class
MainActivity/bin/classes/com/tagworld/slidingmenu/R$integer.class
MainActivity/bin/classes/com/tagworld/slidingmenu/R$layout.class
MainActivity/bin/classes/com/tagworld/slidingmenu/R$menu.class
MainActivity/bin/classes/com/tagworld/slidingmenu/R$string.class
MainActivity/bin/classes/com/tagworld/slidingmenu/R$style.class
MainActivity/bin/classes/com/tagworld/slidingmenu/R$styleable.class

MainActivity/bin/classes/com/tagworld/slidingmenu/SampleListFragment$Sam
pleIconAdapter.class
MainActivity/bin/classes/org/opencv/R$attr.class
MainActivity/bin/classes/org/opencv/R$id.class
MainActivity/bin/classes/org/opencv/R$styleable.class

MainActivity/bin/dexedLibs/actionbar-sherlock-master-f2993a3572b79a353ef
7612d632960d4.jar

MainActivity/bin/dexedLibs/android-support-v4-r13.1-6107c9e87565dd339c81
d4f7f3af1b8c.jar
MainActivity/bin/dexedLibs/opencv library -
2.4.9-ecc4dda902b8c744a7cbf2bcb0ab543a.jar

MainActivity/bin/dexedLibs/slidingmenulib-master-822fb6a8eb84d86e6849da5
db20cbcd8.jar

MainActivity/bin/dexedLibs/viewpagerlibrary-ce2e22893c21daac910ff824ce1e
b56a.jar
MainActivity/bin/resources.ap_
MainActivity/gen/com/actionbarsherlock/R.java
MainActivity/gen/com/jeremyfeinstein/slidingmenu/lib/R.java
MainActivity/gen/com/tagworld/slidingmenu/R.java
MainActivity/gen/org/opencv/R.java
MainActivity/project.properties
Merge branch 'master' of https://github.com/object0814/AssistApp

Conflicts:
	MainActivity/bin/R.txt
	MainActivity/bin/classes/com/actionbarsherlock/R$attr.class
	MainActivity/bin/classes/com/actionbarsherlock/R$id.class
	MainActivity/bin/classes/com/actionbarsherlock/R$styleable.class
	MainActivity/bin/classes/com/example/main/BaseActivity.class
	MainActivity/bin/classes/com/example/main/Fragment1.class
	MainActivity/bin/classes/com/example/main/Fragment2.class
	MainActivity/bin/classes/com/example/main/MainActivity.class
	MainActivity/bin/classes/com/example/switchbutton/SwitchButton.class
	MainActivity/bin/classes/com/example/topviewbitmap/MainActivity.class
	MainActivity/bin/classes/com/example/wifidirect/DeviceDetailFragment.class
	MainActivity/bin/classes/com/example/wifidirect/DeviceListFragment$WifiPeerListAdapter.class
	MainActivity/bin/classes/com/example/wifidirect/DeviceListFragment.class
	MainActivity/bin/classes/com/example/wifidirect/WifiDirectActivity.class
	MainActivity/bin/classes/com/tagworld/slidingmenu/R$attr.class
	MainActivity/bin/classes/com/tagworld/slidingmenu/R$id.class
	MainActivity/bin/classes/com/tagworld/slidingmenu/R$integer.class
	MainActivity/bin/classes/com/tagworld/slidingmenu/R$layout.class
	MainActivity/bin/classes/com/tagworld/slidingmenu/R$menu.class
	MainActivity/bin/classes/com/tagworld/slidingmenu/R$string.class
	MainActivity/bin/classes/com/tagworld/slidingmenu/R$style.class
	MainActivity/bin/classes/com/tagworld/slidingmenu/R$styleable.class
	MainActivity/bin/classes/com/tagworld/slidingmenu/SampleListFragment$SampleIconAdapter.class
	MainActivity/bin/classes/org/opencv/R$attr.class
	MainActivity/bin/classes/org/opencv/R$id.class
	MainActivity/bin/classes/org/opencv/R$styleable.class
	MainActivity/gen/com/actionbarsherlock/R.java
	MainActivity/gen/com/jeremyfeinstein/slidingmenu/lib/R.java
	MainActivity/gen/com/tagworld/slidingmenu/R.java
	MainActivity/gen/org/opencv/R.java
	MainActivity/project.properties

test message oh