mozilla-b2g/gaia — pull request #15754 by alivedise (2014-01-28 04:08:33+00:00)
Title: Bug 949358 - Orientation management for callscreen + lockscreen + active...

... app

Conflicts:
apps/system/js/orientation_manager.js
apps/system/test/unit/orientation_manager_test.js