Merge branch 'master' of https://github.com/loripino21/android into instant_upload_pa...
authorjabarros <jabarros@solidgear.es>
Mon, 6 Oct 2014 12:58:34 +0000 (14:58 +0200)
committerjabarros <jabarros@solidgear.es>
Mon, 6 Oct 2014 12:58:34 +0000 (14:58 +0200)
commit1e7e893321e3939bf773349d41efc18caad7ab99
tree1a595ae2750d5cb10f41d4aca76a461ff78ff4ea
parent45031a321f21143e2e91efd7f12442721b45eca0
parent30726d2cfaa219e79b6d2fa264cf8e2fffa19956
Merge branch 'master' of https://github.com/loripino21/android into instant_upload_path_chooseable
res/values/strings.xml
res/xml/preferences.xml