Merge branch 'develop' into automationTest
authorpurigarcia <pgarcia@solidgear.es>
Mon, 11 May 2015 06:16:43 +0000 (08:16 +0200)
committerpurigarcia <pgarcia@solidgear.es>
Mon, 11 May 2015 06:16:43 +0000 (08:16 +0200)
commit2d95a83959c77a0c4820c6668b439f8e1b0d038a
tree221004acb452d48cdd6395073f2681930dc347dc
parent6a9dfdb3300a6faaf00889f4e919ef92262096de
parentd8f64489779ad1e549bf26bf3b90ce59d1d71ce5
Merge branch 'develop' into automationTest
res/values/strings.xml