good~!!
Merge branch 'master' of
https://github.com/wonsuc/ActionsContentViewSample.git

Conflicts:
	bin/ActionsContentViewExample.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/sample/actionscontentview/ExamplesActivity$SettingsChangedListener.class
	bin/classes/sample/actionscontentview/ExamplesActivity.class
	bin/classes/sample/actionscontentview/R$drawable.class
	bin/classes/sample/actionscontentview/R$id.class
	bin/classes/sample/actionscontentview/R$integer.class
	bin/classes/sample/actionscontentview/R$layout.class
	bin/classes/sample/actionscontentview/R$style.class
	bin/classes/sample/actionscontentview/fragment/AboutFragment.class
	bin/classes/sample/actionscontentview/fragment/NotificationFragment$1.class
	bin/classes/sample/actionscontentview/fragment/NotificationFragment.class
	bin/classes/sample/actionscontentview/fragment/PaymentHistoryFragment$1.class
	bin/classes/sample/actionscontentview/fragment/PaymentHistoryFragment.class
	bin/classes/sample/actionscontentview/fragment/PaymentStatementFragment$1.class
	bin/classes/sample/actionscontentview/fragment/PaymentStatementFragment.class
	bin/classes/sample/actionscontentview/fragment/RecordWeeklyFragment.class
	bin/classes/sample/actionscontentview/fragment/RecordWeeklyTabFragment.class
	bin/classes/sample/actionscontentview/fragment/SampleChartFragment.class
	bin/classes/sample/actionscontentview/fragment/SampleIonFragment$1.class
	bin/classes/sample/actionscontentview/fragment/SampleIonFragment.class
	bin/classes/sample/actionscontentview/fragment/SampleLabelFragment.class
	bin/classes/sample/actionscontentview/fragment/SampleTabFragment.class
	bin/classes/sample/actionscontentview/fragment/SampleTabItem1Fragment.class
	bin/classes/sample/actionscontentview/fragment/SampleTabItem2Fragment.class
	bin/classes/sample/actionscontentview/fragment/SampleTableFragment.class
	bin/classes/sample/actionscontentview/fragment/SandboxFragment$1.class
	bin/classes/sample/actionscontentview/fragment/SandboxFragment.class
	bin/classes/sample/actionscontentview/fragment/WebViewFragment.class
	bin/classes/sample/actionscontentview/util/GlobalProgressDialog.class
	bin/resources.ap_
	gen/sample/actionscontentview/R.java
good~