Merge branch 'develop' into automationTest
authorpurigarcia <pgarcia@solidgear.es>
Fri, 29 May 2015 12:17:52 +0000 (14:17 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Fri, 29 May 2015 12:17:52 +0000 (14:17 +0200)
1  2 
res/values/strings.xml

Simple merge