Bug 874148 - crash in libxul.so!mozilla::hal_impl::GonkDiskSpaceWatcher::OnFileCanReadWithoutBlocking [GonkDiskSpaceWatcher.cpp : 238 + 0x4]. r=fabrice
Merge m-c to birch
Merge m-c to a CLOSED TREE birch
Merge m-c and birch