Merge branch 'master' of https://github.com/loripino21/android into instant_upload_pa...

author jabarros <jabarros@solidgear.es>

Mon, 6 Oct 2014 12:58:34 +0000 (14:58 +0200)

committer jabarros <jabarros@solidgear.es>

Mon, 6 Oct 2014 12:58:34 +0000 (14:58 +0200)
author jabarros <jabarros@solidgear.es>
Mon, 6 Oct 2014 12:58:34 +0000 (14:58 +0200)
committer jabarros <jabarros@solidgear.es>
Mon, 6 Oct 2014 12:58:34 +0000 (14:58 +0200)
diff --cc res/values/strings.xml
Simple merge
diff --cc res/xml/preferences.xml
Simple merge
author	jabarros <jabarros@solidgear.es>
	Mon, 6 Oct 2014 12:58:34 +0000 (14:58 +0200)
committer	jabarros <jabarros@solidgear.es>
	Mon, 6 Oct 2014 12:58:34 +0000 (14:58 +0200)
		1	2
res/values/strings.xml	patch \|	diff1 \|	diff2 \|	blob \| history
res/xml/preferences.xml	patch \|	diff1 \|	diff2 \|	blob \| history