mozilla-b2g/gaia — pull request #14480 by RudyLu (2013-12-07 07:45:08+00:00)
Title: Merge pull request #14304 from RudyLu/keyboard/Bug930358-use_manifestURL...

..._to_indentify_keyboardApp

Bug 930358 - Use manifestURL instead of app origin to identify a
r=gnarf, gary, arthur(cherry picked from commit 846b677b4975639dc61fce28e21d36d724f38160)
a=timdream

Conflicts:
shared/resources/keyboard_layouts.json