Bug 1036830 - build failed if camera-config.js in distribution directory doesn't exist r=gduan
Bug 1031652 - [master] Show warn dialog when call non emergency number on lockscreen. r=Etienne.
Bug 1019816 - Logshake

Add a developer option to store logcat to sdcard by shaking the phone.
Bug 1046798 - Yield uppercase suggestions if input is uppercase
Bug 1048772 - Incorrect value in "app.update.battery-threshold.plugged" and "app.update.battery-threshold.unplugged" are allowed
Bug 1049566 - [NFC] add missing unit tests for NfcManager, r=gweng
Bug 1030431 - correctly handling dialog overlay visibility in the dialer and callscreen apps.
Bug 1048953 - Calendar Day view fails when hour is 00:xx JavaScript error: app://calendar.gaiamobile.org/js/views/current_time.js, line 115: displayHour is null
Bug 1040063 - [v2.1][v2.0] Intermittent test_settings_do_not_track.py failure
Bug 1050396 - Properly handle zero duration in ring command.
Bug 1050529 - Always toggle on a11y settings panel when screen reader is toggled.
Bug 1050402 - Should not skip the current navigation when there is a pending one
Bug 1050144 - [Dialer] 'Call ended' text not vertically centred
Bug 1048711 - L10N with device type follow up
Bug 1044405 - Should set a empty string if there are no text and l10nid provided
Bug 1039219 - Migrate all snippets for preferences in Makefile to preferences.js r=gduan

Conflicts:
	build/preferences.js
Bug1049842 - Change downloadUdatesVia2GForbidden text
Bug 1050196 - [Dialer] Follow up of bug 1024506 - Place new call button momentarily enabled while establishing a second call
Bug 1050801 - Update shared/elements/gaia-header/ to ~v0.3.0
Bug 1016816 - [CostControl] Update to use gaia-header