글쓰기 고치는중... 스플래시 레이아웃화
글쓰기 고치는중... 스플래시 레이아웃화
글쓰기 고치는중... 스플래시 레이아웃화
음?? 스플래시 레이아웃화, 머
aa
aaa
asdf
Merge branch 'master' of https://github.com/ClutchMobile/Clutch

Conflicts:
	.idea/misc.xml
	.idea/modules.xml
	.idea/workspace.xml
	Clutch.iml
	out/production/clutch/Clutch.apk
	out/production/clutch/Clutch.unaligned.apk
	out/production/clutch/another/planet/clutch/R$array.class
	out/production/clutch/another/planet/clutch/R$attr.class
	out/production/clutch/another/planet/clutch/R$color.class
	out/production/clutch/another/planet/clutch/R$dimen.class
	out/production/clutch/another/planet/clutch/R$drawable.class
	out/production/clutch/another/planet/clutch/R$id.class
	out/production/clutch/another/planet/clutch/R$integer.class
	out/production/clutch/another/planet/clutch/R$layout.class
	out/production/clutch/another/planet/clutch/R$string.class
	out/production/clutch/another/planet/clutch/R$style.class
	out/production/clutch/another/planet/clutch/R$styleable.class

out/production/clutch/another/planet/clutch/activity/BallonStatusActivit
y.class

out/production/clutch/another/planet/clutch/activity/BoardDetailActivity
$DetailListAdapter.class

out/production/clutch/another/planet/clutch/activity/BoardDetailActivity
.class

out/production/clutch/another/planet/clutch/activity/FavoriteSettingActi
vity$FavoriteSettingAdapter.class

out/production/clutch/another/planet/clutch/activity/FavoriteSettingActi
vity.class

out/production/clutch/another/planet/clutch/activity/FollowActivity$Foll
owListAdapter.class

out/production/clutch/another/planet/clutch/activity/FollowActivity.clas
s

out/production/clutch/another/planet/clutch/activity/JoinActivity$1.clas
s
	out/production/clutch/another/planet/clutch/activity/JoinActivity.class

out/production/clutch/another/planet/clutch/activity/LoginActivity$1.cla
ss

out/production/clutch/another/planet/clutch/activity/LoginActivity.class

out/production/clutch/another/planet/clutch/activity/MainDetailActivity$
2.class

out/production/clutch/another/planet/clutch/activity/MainDetailActivity$
3.class

out/production/clutch/another/planet/clutch/activity/MainDetailActivity$
CommentContents.class

out/production/clutch/another/planet/clutch/activity/MainDetailActivity$
DetailListAdapter.class

out/production/clutch/another/planet/clutch/activity/MainDetailActivity.
class

out/production/clutch/another/planet/clutch/activity/MainFragmentActivit
y.class

out/production/clutch/another/planet/clutch/activity/OtherClutchActivity
$2.class

out/production/clutch/another/planet/clutch/activity/OtherClutchActivity
$ClutchAdapter.class

out/production/clutch/another/planet/clutch/activity/OtherClutchActivity
.class

out/production/clutch/another/planet/clutch/activity/OtherProfileActivit
y$1.class

out/production/clutch/another/planet/clutch/activity/OtherProfileActivit
y.class

out/production/clutch/another/planet/clutch/activity/ProfileActivity.cla
ss

out/production/clutch/another/planet/clutch/activity/SearchActivity.clas
s

out/production/clutch/another/planet/clutch/activity/SearchResultActivit
y.class

out/production/clutch/another/planet/clutch/activity/SettingActivity.cla
ss

out/production/clutch/another/planet/clutch/activity/SplashActivity$1.cl
ass

out/production/clutch/another/planet/clutch/activity/SplashActivity$2.cl
ass

out/production/clutch/another/planet/clutch/activity/SplashActivity.clas
s

out/production/clutch/another/planet/clutch/activity/StartClutchActivity
$1.class

out/production/clutch/another/planet/clutch/activity/StartClutchActivity
$2.class

out/production/clutch/another/planet/clutch/activity/StartClutchActivity
$3.class

out/production/clutch/another/planet/clutch/activity/StartClutchActivity
.class

out/production/clutch/another/planet/clutch/activity/WebViewActivity.cla
ss
	out/production/clutch/another/planet/clutch/arcmenu/ArcMenu.class

out/production/clutch/another/planet/clutch/dialog/BookDiscriptionDialog
.class

out/production/clutch/another/planet/clutch/dialog/ChooseBookDialog$1.cl
ass

out/production/clutch/another/planet/clutch/dialog/ChooseBookDialog.clas
s
	out/production/clutch/another/planet/clutch/dialog/ClutchDialog.class
	out/production/clutch/another/planet/clutch/dialog/FilterDialog.class
	out/production/clutch/another/planet/clutch/dialog/LinkUrlDialog.class
	out/production/clutch/another/planet/clutch/dialog/MakeBookDialog.class

out/production/clutch/another/planet/clutch/dialog/ProfileImageDialog.cl
ass
	out/production/clutch/another/planet/clutch/dialog/SetPassword.class
	out/production/clutch/another/planet/clutch/dialog/VideoUrlDialog.class

out/production/clutch/another/planet/clutch/fragment/board/FreeBoardFrag
ment$BoardPostAdapter.class

out/production/clutch/another/planet/clutch/fragment/board/FreeBoardFrag
ment.class

out/production/clutch/another/planet/clutch/fragment/board/NewsFragment.
class

out/production/clutch/another/planet/clutch/fragment/board/NoticeFragmen
t$NoticeListAdapter.class

out/production/clutch/another/planet/clutch/fragment/board/NoticeFragmen
t.class

out/production/clutch/another/planet/clutch/fragment/main/BoardFragment.
class

out/production/clutch/another/planet/clutch/fragment/main/FavoriteFragme
nt$FavoriteSpinnerAdapter$1.class

out/production/clutch/another/planet/clutch/fragment/main/FavoriteFragme
nt$FavoriteSpinnerAdapter.class

out/production/clutch/another/planet/clutch/fragment/main/FavoriteFragme
nt$StaggeredFavoriteAdapter.class

out/production/clutch/another/planet/clutch/fragment/main/FavoriteFragme
nt.class

out/production/clutch/another/planet/clutch/fragment/main/MainFragment$1
.class

out/production/clutch/another/planet/clutch/fragment/main/MainFragment$S
taggeredAdapter$1.class

out/production/clutch/another/planet/clutch/fragment/main/MainFragment$S
taggeredAdapter$2.class

out/production/clutch/another/planet/clutch/fragment/main/MainFragment$S
taggeredAdapter$3.class

out/production/clutch/another/planet/clutch/fragment/main/MainFragment$S
taggeredAdapter$4.class

out/production/clutch/another/planet/clutch/fragment/main/MainFragment$S
taggeredAdapter$6.class

out/production/clutch/another/planet/clutch/fragment/main/MainFragment$S
taggeredAdapter.class

out/production/clutch/another/planet/clutch/fragment/main/MainFragment.c
lass

out/production/clutch/another/planet/clutch/fragment/main/ProfileFragmen
t.class

out/production/clutch/another/planet/clutch/fragment/main/RankFragment$1
.class

out/production/clutch/another/planet/clutch/fragment/main/RankFragment$R
ankList.class

out/production/clutch/another/planet/clutch/fragment/main/RankFragment$R
ankListAdapter$1.class

out/production/clutch/another/planet/clutch/fragment/main/RankFragment$R
ankListAdapter.class

out/production/clutch/another/planet/clutch/fragment/main/RankFragment.c
lass

out/production/clutch/another/planet/clutch/fragment/profile/ClutchBookF
ragment$CBAdapter.class

out/production/clutch/another/planet/clutch/fragment/profile/ClutchBookF
ragment.class

out/production/clutch/another/planet/clutch/fragment/profile/ClutchFragm
ent$1.class

out/production/clutch/another/planet/clutch/fragment/profile/ClutchFragm
ent$StaggeredAdapter$1.class

out/production/clutch/another/planet/clutch/fragment/profile/ClutchFragm
ent$StaggeredAdapter$2.class

out/production/clutch/another/planet/clutch/fragment/profile/ClutchFragm
ent$StaggeredAdapter$3.class

out/production/clutch/another/planet/clutch/fragment/profile/ClutchFragm
ent$StaggeredAdapter.class

out/production/clutch/another/planet/clutch/fragment/profile/ClutchFragm
ent.class

out/production/clutch/another/planet/clutch/fragment/profile/LikeFragmen
t$1.class

out/production/clutch/another/planet/clutch/fragment/profile/LikeFragmen
t$StaggeredAdapter$1.class

out/production/clutch/another/planet/clutch/fragment/profile/LikeFragmen
t$StaggeredAdapter$2.class

out/production/clutch/another/planet/clutch/fragment/profile/LikeFragmen
t$StaggeredAdapter$3.class

out/production/clutch/another/planet/clutch/fragment/profile/LikeFragmen
t$StaggeredAdapter.class

out/production/clutch/another/planet/clutch/fragment/profile/LikeFragmen
t.class

out/production/clutch/another/planet/clutch/fragment/profile/MoreFragmen
t.class

out/production/clutch/another/planet/clutch/fragment/profile/other/Clutc
hBookFragment$CBAdapter.class

out/production/clutch/another/planet/clutch/fragment/profile/other/Clutc
hBookFragment.class

out/production/clutch/another/planet/clutch/fragment/profile/other/Clutc
hFragment$1.class

out/production/clutch/another/planet/clutch/fragment/profile/other/Clutc
hFragment$StaggeredAdapter$1.class

out/production/clutch/another/planet/clutch/fragment/profile/other/Clutc
hFragment$StaggeredAdapter$2.class

out/production/clutch/another/planet/clutch/fragment/profile/other/Clutc
hFragment$StaggeredAdapter$3.class

out/production/clutch/another/planet/clutch/fragment/profile/other/Clutc
hFragment$StaggeredAdapter.class

out/production/clutch/another/planet/clutch/fragment/profile/other/Clutc
hFragment.class

out/production/clutch/another/planet/clutch/fragment/profile/other/LikeF
ragment$1.class

out/production/clutch/another/planet/clutch/fragment/profile/other/LikeF
ragment$StaggeredAdapter$1.class

out/production/clutch/another/planet/clutch/fragment/profile/other/LikeF
ragment$StaggeredAdapter$2.class

out/production/clutch/another/planet/clutch/fragment/profile/other/LikeF
ragment$StaggeredAdapter$3.class

out/production/clutch/another/planet/clutch/fragment/profile/other/LikeF
ragment$StaggeredAdapter.class

out/production/clutch/another/planet/clutch/fragment/profile/other/LikeF
ragment.class

out/production/clutch/another/planet/clutch/fragment/profile/other/MoreF
ragment.class

out/production/clutch/another/planet/clutch/fragment/search/ResultClutch
BookFragment$ClutchBookAdapter$1.class

out/production/clutch/another/planet/clutch/fragment/search/ResultClutch
BookFragment$ClutchBookAdapter.class

out/production/clutch/another/planet/clutch/fragment/search/ResultClutch
BookFragment.class

out/production/clutch/another/planet/clutch/fragment/search/ResultClutch
Fragment$1.class

out/production/clutch/another/planet/clutch/fragment/search/ResultClutch
Fragment$CardAdapter$1.class

out/production/clutch/another/planet/clutch/fragment/search/ResultClutch
Fragment$CardAdapter$2.class

out/production/clutch/another/planet/clutch/fragment/search/ResultClutch
Fragment$CardAdapter.class

out/production/clutch/another/planet/clutch/fragment/search/ResultClutch
Fragment.class

out/production/clutch/another/planet/clutch/upload/ChooseBookDialog$1$1.
class

out/production/clutch/another/planet/clutch/upload/ChooseBookDialog$1$2.
class

out/production/clutch/another/planet/clutch/upload/ChooseBookDialog$1.cl
ass

out/production/clutch/another/planet/clutch/upload/ChooseBookDialog$2.cl
ass

out/production/clutch/another/planet/clutch/upload/ChooseBookDialog$Clut
chBook.class

out/production/clutch/another/planet/clutch/upload/ChooseBookDialog.clas
s

out/production/clutch/another/planet/clutch/upload/LinkUploadActivity$1.
class

out/production/clutch/another/planet/clutch/upload/LinkUploadActivity.cl
ass

out/production/clutch/another/planet/clutch/upload/PhotoChooseActivity$I
mageAdapter.class

out/production/clutch/another/planet/clutch/upload/PhotoChooseActivity.c
lass

out/production/clutch/another/planet/clutch/upload/PhotoUploadActivity$1
.class

out/production/clutch/another/planet/clutch/upload/PhotoUploadActivity.c
lass

out/production/clutch/another/planet/clutch/upload/UploadTagActivity.cla
ss

out/production/clutch/another/planet/clutch/upload/VideoUploadActivity.c
lass

out/production/clutch/another/planet/clutch/util/ClutchUtil$Clutch$Clutc
hResult.class

out/production/clutch/another/planet/clutch/util/ClutchUtil$Clutch$Comme
ntResult.class

out/production/clutch/another/planet/clutch/util/ClutchUtil$Clutch.class

out/production/clutch/another/planet/clutch/util/ClutchUtil$ClutchBookAr
ray.class

out/production/clutch/another/planet/clutch/util/ClutchUtil$Image$ImageR
esult.class

out/production/clutch/another/planet/clutch/util/ClutchUtil$Ranking$Rank
ingResult.class

out/production/clutch/another/planet/clutch/util/ClutchUtil$User$ClutchB
ookResult.class

out/production/clutch/another/planet/clutch/util/ClutchUtil$User$Followe
rResult.class

out/production/clutch/another/planet/clutch/util/ClutchUtil$User$Followi
ngResult.class

out/production/clutch/another/planet/clutch/util/ClutchUtil$User$LoginRe
sult.class

out/production/clutch/another/planet/clutch/util/ClutchUtil$User$Profile
Result.class

out/production/clutch/another/planet/clutch/util/ClutchUtil$User$StarRes
ult.class
	out/production/clutch/another/planet/clutch/util/ClutchUtil$User.class
	out/production/clutch/another/planet/clutch/util/ClutchUtil.class

out/production/clutch/another/planet/clutch/util/Construct$ClutchBook.cl
ass

out/production/clutch/another/planet/clutch/util/Construct$MainCard.clas
s
	out/production/clutch/another/planet/clutch/util/Construct.class

out/production/clutch/another/planet/clutch/util/HTML5WebView$MyWebChrom
eClient.class
	out/production/clutch/another/planet/clutch/util/HTML5WebView.class
	out/production/clutch/another/planet/clutch/util/TaskUtil$1.class
	out/production/clutch/another/planet/clutch/util/TaskUtil.class
	out/production/clutch/com/android/gallery/R$array.class
	out/production/clutch/com/android/gallery/R$color.class
	out/production/clutch/com/android/gallery/R$id.class
	out/production/clutch/com/android/gallery/R$string.class
	out/production/clutch/com/facebook/android/R$attr.class
	out/production/clutch/com/facebook/android/R$color.class
	out/production/clutch/com/facebook/android/R$dimen.class
	out/production/clutch/com/facebook/android/R$drawable.class
	out/production/clutch/com/facebook/android/R$id.class
	out/production/clutch/com/facebook/android/R$integer.class
	out/production/clutch/com/facebook/android/R$string.class
	out/production/clutch/com/facebook/android/R$styleable.class
	out/production/clutch/com/google/android/gms/R$attr.class
	out/production/clutch/com/google/android/gms/R$color.class
	out/production/clutch/com/google/android/gms/R$id.class
	out/production/clutch/com/google/android/gms/R$string.class
	out/production/clutch/com/google/android/gms/R$styleable.class
	out/production/clutch/com/handmark/pulltorefresh/library/R$attr.class
	out/production/clutch/com/handmark/pulltorefresh/library/R$dimen.class
	out/production/clutch/com/handmark/pulltorefresh/library/R$id.class
	out/production/clutch/com/handmark/pulltorefresh/library/R$layout.class
	out/production/clutch/com/handmark/pulltorefresh/library/R$string.class

out/production/clutch/com/handmark/pulltorefresh/library/R$styleable.cla
ss
	res/drawable-xhdpi/temp_splash.png
	src/another/planet/clutch/activity/LoginActivity.java
	src/another/planet/clutch/activity/MainDetailActivity.java
	src/another/planet/clutch/activity/OtherClutchActivity.java
	src/another/planet/clutch/activity/SplashActivity.java
	src/another/planet/clutch/fragment/main/MainFragment.java
	src/another/planet/clutch/fragment/main/RankFragment.java
	src/another/planet/clutch/fragment/search/ResultClutchBookFragment.java
	src/another/planet/clutch/fragment/search/ResultClutchFragment.java
	src/another/planet/clutch/util/ClutchUtil.java
	src/another/planet/clutch/util/Construct.java
	src/another/planet/clutch/util/TaskUtil.java