mozilla-b2g/gaia — pull request #26160 by mikehenrty (2014-11-14 21:24:50+00:00)
Title: Merge pull request #25819 from mikehenrty/bug-1090152-fix-icon-visibilit...

...y

Bug 1090152 - Make sure we display statusbar icons on lockscreen even wi...
Conflicts:
apps/system/test/marionette/lib/statusbar.js