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

@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="banner_ad_unit_id">ca-app-pub-0000000000000000/0000000000</string>
<string name="analytics_tracking_id">UA-39570140-8</string>
</resources>