Karim Abou Zeid 69bb951e1d Merge branch 'master' into phonograph_pro ... # Conflicts: # app/src/main/res/values/strings.xml		2017-08-30 20:58:09 +02:00
..
androidTest/java/com/kabouzeid/gramophone	Renamed package to gramophone	2015-03-05 16:50:16 +01:00
debug/res	Renamed a string resource file.	2016-03-24 22:17:48 +01:00
main	Merge branch 'master' into phonograph_pro	2017-08-30 20:58:09 +02:00
test/java/com/kabouzeid/gramophone	Added default unit test from the newer sample projects.	2016-03-24 15:17:55 +01:00