Bug 939679: pick correct camera preview size on HD devices
Merge pull request #14911 from davidflanagan/bug939679hd

Bug 939679: pick correct camera preview size on HD devices r=dmarcos
Bug 899070 - wrapTextIntoSafeHTMLString should really return a safe html string. r=asuth
Merge branch 'v1-train' into v1.1.0hd
Bug 901926 - [Email] Email app stops working if attachment contains an IMAP literal. r=asuth, a=Preeti
Merge branch 'v1-train' into v1.1.0hd