aaa

aaa
Merge remote-tracking branch 'origin/master'

Conflicts:
	SlidingMenuVN/source/example/bin/2nd.apk
	SlidingMenuVN/source/example/bin/classes.dex
	SlidingMenuVN/source/example/bin/resources.ap_
	SlidingMenuVN/source/example/src/com/lop2/anim/CustomAnimation.java
	SlidingMenuVN/source/example/src/com/lop2/anim/CustomScaleAnimation.java
	SlidingMenuVN/source/example/src/com/lop2/anim/CustomSlideAnimation.java
	SlidingMenuVN/source/example/src/com/lop2/anim/CustomZoomAnimation.java
	SlidingMenuVN/source/example/src/com/lop2/fragments/BirdActivity.java
	SlidingMenuVN/source/example/src/com/lop2/fragments/BirdGridFragment.java
	SlidingMenuVN/source/example/src/com/lop2/fragments/BirdMenuFragment.java
	SlidingMenuVN/source/example/src/com/lop2/fragments/Changer1_FragmentChangeActivity.java
	SlidingMenuVN/source/example/src/com/lop2/fragments/Changer2_KienThucDeMucFragment.java
	SlidingMenuVN/source/example/src/com/lop2/fragments/Changer3_LamBaiWindow.java
	SlidingMenuVN/source/example/src/com/lop2/fragments/F0_BeginFragment.java
	SlidingMenuVN/source/example/src/com/lop2/fragments/F1_DeMucFragment.java
	SlidingMenuVN/source/example/src/com/lop2/fragments/F2_NoiDungKienThucFragment.java
	SlidingMenuVN/source/example/src/com/lop2/fragments/Menu1_ChuongFragment.java
	SlidingMenuVN/source/example/src/com/lop2/fragments/Menu2_CacDeMuc.java
	SlidingMenuVN/source/example/src/com/lop2/fragments/Menu3_OptionMenuTracNghiem.java
	SlidingMenuVN/source/example/src/com/lop2/fragments/ResponsiveUIActivity.java
	SlidingMenuVN/source/example/src/com/lop2/main/AttachExample.java
	SlidingMenuVN/source/example/src/com/lop2/main/BaseActivity.java
	SlidingMenuVN/source/example/src/com/lop2/main/LeftAndRightActivity.java
	SlidingMenuVN/source/example/src/com/lop2/main/SampleListFragment.java
	SlidingMenuVN/source/example/src/com/lop2/main/SlidingContent.java
	SlidingMenuVN/source/example/src/com/lop2/main/SlidingTitleBar.java
	SlidingMenuVN/source/example/src/com/lop2/main/TempActivity.java
	SlidingMenuVN/source/example/src/com/lop2/main/Util.java
	SlidingMenuVN/source/example/src/com/lop2/main/ViewPagerActivity.java
Merge branches 'master' and 'master' of https://github.com/einsteinarbert/Wireless2014

Conflicts:
	SlidingMenuVN/source/example/.settings/org.eclipse.core.resources.prefs
	SlidingMenuVN/source/example/bin/AndroidManifest.xml
	SlidingMenuVN/source/example/bin/R.txt
	SlidingMenuVN/source/example/bin/classes.dex
	SlidingMenuVN/source/example/bin/proguard.txt
	SlidingMenuVN/source/example/bin/resources.ap_
	SlidingMenuVN/source/example/gen/com/actionbarsherlock/R.java

	SlidingMenuVN/source/example/gen/com/jeremyfeinstein/slidingmenu/example/R.java

	SlidingMenuVN/source/example/gen/com/jeremyfeinstein/slidingmenu/lib/R.java
	SlidingMenuVN/source/example/lint.xml
	SlidingMenuVN/source/example/res/layout/item.xml
	SlidingMenuVN/source/example/src/Expression/Randomize.java

	SlidingMenuVN/source/example/src/com/lop2/fragments/Changer3_LamBaiWindow.java

	SlidingMenuVN/source/example/src/com/lop2/fragments/F1_DeMucFragment.java
	SlidingMenuVN/source/example/src/com/lop2/fragments/F3_LamBaiTap.java

	SlidingMenuVN/source/example/src/com/lop2/fragments/Menu1_ChuongFragment.java
	SlidingMenuVN/source/example/src/com/lop2/fragments/Menu2_CacDeMuc.java

	SlidingMenuVN/source/example/src/com/lop2/fragments/Menu3_OptionMenuTracNghiem.java
	SlidingMenuVN/source/example/src/com/lop2/main/Lop2.java
	SlidingMenuVN/source/example/src/inout2nd/Database.java
	SlidingMenuVN/source/example/src/inout2nd/SinhCauHoi.java