Bug 935041 - Investigate test_sms_add_contact failure, resolve and re-enable the test
Merge pull request #13388 from zacc/bug_935041

Bug 935041 - Investigate test_sms_add_contact failure, resolve and re-en...
Bug 934768 - [e.me] API key change for v1.2 [r=crdlc]
Add truncation to avoid MMS filename limitation r=rwaldron
Merge pull request #13300 from davidflanagan/bug915001hd

Bug 915001 - save edited images using tiles and display a progress bar r=hshih(cherry picked from commit d19550e2fb7331d5e4a54e8e998753378e7fd44a)

Conflicts:

	apps/gallery/index.html
	apps/gallery/js/ImageEditor.js

fix lint
bug 935052 - fall back to top-most frame after closing call in dialer tests
Merge pull request #13393 from davidflanagan/bug915001

Merge pull request #13300 from davidflanagan/bug915001hd
Merge pull request #13387 from zacc/bug_935052_phone

bug 935052 - fall back to top-most frame after closing call in dialer te...
Merge pull request #13369 from EverythingMe/v1.2-apikey

Bug 934768 - [e.me] API key change for v1.2 [r=crdlc]
Added 'state' key/value store to View class for automatically invoking the render() method when the state changes. Completely extracted out the controls from camera.js.
Merge remote-tracking branch 'upstream/master'