Johannes Mockenhaupt 643f3aee6c Merge branch 'dev' into dev-merge		2018-03-18 20:20:40 +01:00
..
wearintegration	more checks for null profile	2018-03-17 18:07:22 +01:00
ActionStringHandler.java	Profile tests	2018-03-18 15:02:21 +01:00
WearFragment.java	preferences update	2017-11-01 20:43:59 +01:00
WearPlugin.java	Merge commit 'origin/dev^' into combo-dev-merge	2018-03-16 15:44:54 +01:00