Christian Schabesberger 6944f4a68a add copyright headers and update sdk		2016-09-12 00:33:11 +02:00
..
java	add copyright headers and update sdk	2016-09-12 00:33:11 +02:00
res	fix merge with add_cahnnels	2016-09-12 00:12:00 +02:00
AndroidManifest.xml	fix merge with add_cahnnels	2016-09-12 00:12:00 +02:00