mozilla-b2g/gaia — pull request #17112 by sprd-ffos (2014-03-12 07:30:48+00:00)
Title: Bug 894744 - Use localStorage event to make inter-page communication bet...

...ween music app and music activity a=tzhuang

Conflicts:
apps/music/js/Player.js