Merge branch 'develop' into navigationDrawer_basic
authorDavid A. Velasco <dvelasco@solidgear.es>
Mon, 15 Jun 2015 11:43:17 +0000 (13:43 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Mon, 15 Jun 2015 11:43:17 +0000 (13:43 +0200)
Conflicts FIXED:
res/layout/files.xml


No differences found