Bug 815791 - separate video view activity from video player app
Bug 821514 - display error message if youtube won't play video
Merge pull request #7246 from davidflanagan/youtube6

Bug 821514 - display error message if youtube won't play video
Bug 825046 - delete videos correctly
Merge pull request #7249 from davidflanagan/bug825046

Bug 825046 - delete videos correctly
Bug 823150 - App update - fixing the ondownloadavailable callback
r=vingtetun
Merge pull request #7228 from etiennesegonzac/bug-823150-app-update-notification-delay

Bug 823150 - App update - fixing the ondownloadavailable callback
tweak youtube-error-prefix string r=pike a=blocking+
Merge pull request #7250 from davidflanagan/bug825522

tweak youtube-error-prefix string r=pike a=blocking+
Bug 824117 - [music] use a single player to open the received file
Merge pull request #7234 from dominickuo/music-open-received-file

Bug 824117 - [music] use a single player to open the received file, r=djf, a=bb+
Update binary location for b2g-desktop r=etienne_s a=test-only
Merge pull request #7248 from lightsofapollo/botio-test-test

Update b2g bin location for bot.io
Bug 822232 followup. Missing '{'. r=me
Merge pull request #7256 from vingtetun/followups

Bug 822232 followup. Missing '{'. r=me
Bug 822055 - [SMS] Messages sent are duplicated in thread and throbber is visible on each message r=borja

Remove the pending IndexedDB, refactored how we handle all the events, and
generally made the Sms app more consistent and responsive.

This fixes the duplicated message in thread.

Fixed some other bugs in the process :
- duplicated message when we were resending a failed message
- the received SMS was not displayed when I sent it to myself
- when I was sending the first SMS to a contact, and when I was hiding the Sms
  app (using the home button) and then going back to the Sms app, then the
  thread was empty. This happened only when the phone number was not normalized
  yet in the hash.
- now we try to send the SMS even if we don't have mozSettings
- fix notification was appearing when we were already in the good thread, when
  the num was not normalized yet
- now we store in gecko a SMS that the user tried to send when airplane mode was
  set.
Bug 806352 - [Contacts] Sending SMS from contact detail doesn't open Message app in edit mode
Merge pull request #7258 from borjasalguero/bug_806352_rebased

Bug 806352 - [Contacts] Sending SMS from contact detail doesn't open Mes...
Bug 808819 - Using the mozSms.getThreadList API to populate the SMS app
thread list.
r=fbsc
Merge pull request #7259 from etiennesegonzac/bug-808819-sms-use-getthreadlist

Bug 808819 - Using the mozSms.getThreadList API to populate the SMS app thread list.