Merge branch 'flx' into modular-prepare
commit751f7f14a81170c8e8f8623cafcf14de3a5e8956
authorFelix Bechstein <f@ub0r.de>
Sun, 10 Jan 2010 14:27:17 +0000 (10 15:27 +0100)
committerFelix Bechstein <f@ub0r.de>
Sun, 10 Jan 2010 14:27:17 +0000 (10 15:27 +0100)
tree581ba444024f3ff55e637e8b90a427a2b0f5e715
parent7089261b9f9e85048d8fd10f0a92cdf36f11b041
parentc06cbd095a647106db757d8ad9b259531e8d567e
Merge branch 'flx' into modular-prepare
res/values/strings.xml