GitHub PushEvent at 2014-01-16 11:30:32
Repository: pdm-client
Actor: chende008
Payload: {"shas":[["91ae5c4f0ef0d82e3d746f3b853c75db42d0d024","05aedd0fa71a746558e08297ae3d82d980f29794@qq.com","Merge branch 'master' into chende\n\nConflicts:\n\tsrc/com/chainton/pdmclient/fragments/ContactFragment.java","chende",false],["b2b23c923996da6043a5af9beb8a57ca864cdd3c","05aedd0fa71a746558e08297ae3d82d980f29794@qq.com","Merge branch 'chende'","chende",false],["e5bb7e97f7002659a5f755af65138c994e9e8614","e3d14384903f11901c37d59835e4246b10350a97@danke360.com","修改我的空间媒体显示的情况","chenyan",false],["5ec54c9acfce41716fc314bbcb5eadae90ce4dea","e3d14384903f11901c37d59835e4246b10350a97@danke360.com","Merge remote-tracking branch 'origin/master' into chenyan\n\nConflicts:\n\tres/layout/frag_music_item.xml\n\tres/layout/frag_video_item.xml\n\tres/values/strings.xml\n\tsrc/com/chainton/pdmclient/adapters/FragMusicAdapter.java\n\tsrc/com/chainton/pdmclient/fragments/MusicFragment.java\n\tsrc/com/chainton/pdmclient/fragments/PictureFragment.java\n\tsrc/com/chainton/pdmclient/fragments/VideoFragment.java\n\tsrc/com/chainton/pdmclient/system/service/GalleryMusicService.java\n\tsrc/com/chainton/pdmclient/system/service/GalleryPictureService.java\n\tsrc/com/chainton/pdmclient/system/service/GalleryVideoService.java\n\tsrc/com/chainton/pdmclient/system/service/SystemMediaService.java","chenyan",true]],"size":4,"ref":"refs/heads/chende","head":"5ec54c9acfce41716fc314bbcb5eadae90ce4dea"}