Bug 811528 - pref native identity on
Bug 826366 - Remove on call cpu wakelock if the screen is not turned off by proximity event
Merge pull request #7290 from timdream/scm/remove-cpulock-when-manual-off

Bug 826366 - Remove on call cpu wakelock if the screen is not turned off by proximity event, r=etienne, a=blocking-basecamp
Merge pull request #6845 from jedp/811528-pref-identity-on

Bug 811528 - pref native identity on; r=ferjm
bug 824621, localize email address placeholder in ftu
Merge pull request #7293 from Pike/bug-824621-l12y-email-address

bug 824621, localize email address placeholder in ftu
Fix unit test instructions in readme
Bug 826468 - [Email] Change in XHR behaviour makes autoconfig fail on "Looking in local file store" for all domains not in gaia/apps/email/autoconfig/ (workaround); r=asuth, a=blocking-basecamp
Merge pull request #7296 from mozsquib/email-autoconfig-xhr-workaround

Bug 826468 - [Email] Change in XHR behaviour makes autoconfig fail on "L.ooking in local file store" for all domains not in gaia/apps/email/autoconfig/ (workaround)
Bug 826621 - when we clear a media frame, remember that we cleared it r=daleharvey a=blocking+
Merge pull request #7297 from davidflanagan/bug826621

Bug 826621 - when we clear a media frame, remember that we cleared it r=daleharvey a=blocking+