Merge branch 'master' into kioskmode

This commit is contained in:
Ruben 2017-06-26 12:05:53 +08:00
commit 3974b59919

View file

@ -9,8 +9,8 @@ android {
applicationId 'com.rubenvandeven.emotion_hero.kiosk' applicationId 'com.rubenvandeven.emotion_hero.kiosk'
minSdkVersion 16 minSdkVersion 16
targetSdkVersion 24 targetSdkVersion 24
versionCode 8 versionCode 9
versionName '1.0' versionName '1.1'
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
renderscriptTargetApi 16 renderscriptTargetApi 16