mozilla-b2g/gaia — pull request #10283 by mcirlanaru (2013-06-10 00:23:34+00:00)
Title: Merge pull request #9218 from mcirlanaru/bug_834542

Bug 834542 - Display time in the status bar for the emergency call screen, r=@timdream(cherry picked from commit 564b1b13d0b1d19753450d5355c9124dd07b2e02)

Conflicts:

apps/system/js/lockscreen.js
apps/system/js/statusbar.js