Bug 851064: Allow one-level deep ropes when flattening for substr, r=evilpies
Bug 872809 – Add sk to multi-locale APK for beta 2 r=akeybl a=akeybl

--HG--
extra : transplant_source : %B1%1C%04%03%08%16%EEY%9D%CD%60%24%A1%EF%FF%C8j%AB%04%C2