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)
commit66f3a45d050c27e41296ddc9083d968cfd8803a4
treef659d9ff05ddb63ad7af4c4843dd01276b0f4802
parente81b00207fa4a9848670d0869f119dfd084c6ae8
parent42da742d5e96072a03f4a34314c50c7bc9193b03
Merge branch 'develop' into navigationDrawer_basic

Conflicts FIXED:
res/layout/files.xml
res/layout/files.xml
res/values/strings.xml