Merge branch 'master' into 'master'

Re-enable Dialer for Pebble 2.42 and build against AndroidPebbleCommons@r1

The author confirmed that this is actually correct, and @r2 is wrong
It is also written here:
https://github.com/matejdro/PebbleDialer-Android/blob/2.42/README.md

See merge request !1029
This commit is contained in:
Boris Kraut 2015-10-27 16:34:31 +00:00
commit 2ddf1c0681

View file

@ -45,12 +45,11 @@ Build:2.41,25
prebuild=sed -i 's_../PebbleAndroidCommons_app/$$AndroidPebbleCommons$$_' ../settings.gradle
Build:2.42,26
disable=remove apk; APC@r2 doesnt compile
commit=2.42
subdir=app
patch=remove_crashlytics_and_internet_permission_2.41.diff
gradle=yes
srclibs=AndroidPebbleCommons@r2
srclibs=AndroidPebbleCommons@r1
prebuild=sed -i 's_../PebbleAndroidCommons_app/$$AndroidPebbleCommons$$_' ../settings.gradle
Auto Update Mode:None