Milos Kozak d142d2e4f9 resolve RS merge conflict		2017-10-10 16:47:03 +02:00
..
assets	Logging: Print filename and line instead of logger name.	2017-08-13 21:31:21 +02:00
java	resolve RS merge conflict	2017-10-10 16:47:03 +02:00
jniLibs	initial RS work	2017-09-13 00:35:03 +02:00
res	resolve RS merge conflict	2017-10-10 16:47:03 +02:00
AndroidManifest.xml	initial RS work	2017-09-13 00:35:03 +02:00