Aidan Follestad 4d39cae75b ActionBarActivity is now AppCompatActivity, which has lots of new internals. http://android-developers.blogspot.com/2015/04/android-support-library-221.html		2015-04-21 17:53:32 -05:00
..
java/com/kabouzeid/gramophone	ActionBarActivity is now AppCompatActivity, which has lots of new internals. http://android-developers.blogspot.com/2015/04/android-support-library-221.html	2015-04-21 17:53:32 -05:00
res	Removed invalid locale identifier (values-es-r419 gives an error in Android Studio's newer update).	2015-04-21 17:10:57 -05:00
AndroidManifest.xml	merged everything together correctly	2015-04-17 01:39:41 +02:00