merged faridk's code

2016-02-22 19:58:04 +01:00 · 2016-02-22 19:58:04 +01:00 · dddcc80f30
commit dddcc80f30
parent 8854c8c9d0 3a8611ebf8
19 changed files with 2633 additions and 11 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -42,4 +42,5 @@ dependencies {
    compile 'de.hdodenhof:circleimageview:2.0.0'
    compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
    compile 'com.github.nirhart:parallaxscroll:1.0'
+    compile 'com.google.android.exoplayer:exoplayer:r1.5.5'
 }