mozilla-b2g/gaia — pull request #21621 by lhadji (2014-07-11 12:16:40+00:00)
Title: Bug 1037395 - Overriding profile value with partner preferences on commo...

...n prefs

The preferences from PARTNER_PREF_FILES are appended
to profile/user.js but if there's a common preference
on both user.js and PARTNER_PREF_FILES, user.js preference
is replaced with the partner's preference value.

Change-Id: Ie0beb98d33470d9ae91dd4cbf948f89219d8b94f