Bug 960114 - Multiple CSS warnings shown when launching the Gallery app
Bug 968122 - Add default styles for homescreen dialogs
Bug 968069 - Make header (month date) localizable in thumbnail view
Bug 963917: reduce Gallery memory use (and fix leak) while scanning

force software canvases for thumbnail and preview creation with willReadFrequently

Free canvas memory after creating a thumbnail

Make sure our thumbnail blobs are file-backed not memory-backed

update mediadb docs
(cherry picked from commit 4b5eaa4a2823d8961b80a3b975b1eeed92b9fcb7)

Conflicts:

	apps/gallery/js/MetadataParser.js
	apps/gallery/js/gallery.js
Bug 952797 - Reactivation the dialer keypad integrations tests.
(the marionette issue was fixed by bug 891882)
Bug 930563 - [B2G][L10n][Clock] Chinese Traditional: Highlight date instead of first number displayed.
Bug 960705 - [clock][l10n] Close button should say Stop instead; r=reviews
Bug 968071 - Taken/Shoot date in image/video info not localizable

This approach let us reuse an existing string, so it can be ported to
1.3

Note that this also changes the en-US format from mm-dd-YYYY to
mm/dd/YYYY
Bug 970936 - Fix intermittent failure in test_gallery_empty.py
Merge pull request #15458 from cctuan/960114

Bug 960114 - Multiple CSS warnings shown when launching the Gallery app
Bug 971652 - Browser lost it's icon after re-install
Revert "Merge pull request #16166 from yurenju/comm-makefile"

This is breaking make install-gaia

This reverts commit e6f7bfd0c2f1e302375951d3a612c117e94a054c, reversing
changes made to d999becbdc7962e6491c7a0bf4d619b44da69373.

Conflicts:
	build/applications-data.js
Merge pull request #16174 from viorelaioia/bug_970936

Bug 970936 - Fix intermittent failure in test_gallery_empty.py
Bug 955626 - Change start_b2g wait in GaiaTest to wait for AppWindowManager to acknowledge the active frame instead of js event
Bug 971647 - Ignore load script error in blanket
Merge pull request #16205 from timdream/browser-hires-icon

Bug 971652 - Browser lost it's icon after re-install, r=benfrancis
Merge pull request #16073 from flodolo/bug968069_monththumbnail

Bug 968069 - [Gallery] Make header (month date) localizable in thumbnail view
Merge pull request #15972 from comoyo/bug968122

Bug 968122 - Add default styles for homescreen dialogs. r=crdlc
Bug 971691 - "day view header copy should not overflow" marionette js test is failing
Merge pull request #16214 from millermedeiros/971691-travis-day-view-header

Bug 971691 - "day view header copy should not overflow" marionette js test is failing r=gaye