Fix Select Local Version or Keep Both behaviour when solving file coflict
[pub/Android/ownCloud.git] / tests / res / values /
2012-09-29 Bartek Przybylskijunit for android app