Merge branch 'analytics'

Conflicts:
	app/build.gradle
	app/src/main/java/net/headlezz/notificationlogger/MainActivity.java
	app/src/main/res/values/system_strings.xml
This commit is contained in:
danijoo
2016-01-09 03:45:38 +01:00
16 changed files with 172 additions and 4 deletions

View File

@@ -54,5 +54,6 @@ dependencies {
transitive = true
}
compile 'com.google.android.gms:play-services-ads:8.3.0'
compile 'com.google.android.gms:play-services-ads:8.4.0'
compile 'com.google.android.gms:play-services-analytics:8.4.0'
}