Bug 875892 - followup bug fix, touchup left over dismissAppbar call. r=me
Bug 875892 - followup bug fix v2, touchup another left over dismissAppbar call. r=me DONTBUILD
Bumping gaia.json for 2 gaia-central revision(s)
Truncated some number of revisions since the previous bump.

========

https://hg.mozilla.org/integration/gaia-central/rev/21e1cf17d62c
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #10685 from daleharvey/885349

Bug 885349 - Check for hasVideo flag on context menu and treat as audio if false. r=benfrancis

========

https://hg.mozilla.org/integration/gaia-central/rev/6f879dde20f6
Author: Dale Harvey <dale@arandomurl.com>
Desc: Bug 885349 - Check for hasVideo flag on context menu and treast as audio if none.
Merge mozilla-central and birch
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/b64e747d9322
Author: Ian Liu <iliu@mozilla.com>
Desc: Merge pull request #10658 from ian-liu/settings/Bug881985_do_not_update_language_button_and_description_in_Language_menu

Bug 881985 - [Settings] Do not update language button and description in Language menu, r=@fabi1cazenave

========

https://hg.mozilla.org/integration/gaia-central/rev/b31d810c77eb
Author: ian-liu <iliu@mozilla.com>
Desc: Bug 881985 - [Settings] Do not update language button and description in Language menu
Bumping gaia.json for 2 gaia-central revision(s)

========

https://hg.mozilla.org/integration/gaia-central/rev/67fc22e628e1
Author: Francisco Jordano <arcturus@ardeenelinfierno.com>
Desc: Merge pull request #10673 from wanderview/contacts-edit-noname

Bug 887564: Do not show phone # in name edit field

========

https://hg.mozilla.org/integration/gaia-central/rev/e4b3224b9a90
Author: Ben Kelly <ben@wanderview.com>
Desc: Bug 887564: Do not show phone # in name edit field

Previously the contacts_list code would overwrite the givenName field in
the contact object.  This was done so that different values could be
shown in the list if a name was not present.  This causes problems, though,
when the contact object is shared between multiple parts of the app.  In
this case the contacts_form code was getting handed one of these modified
contact objects.

Modify the code to calculate the display name, but not modify the contact
object itself.  Also refactor how contacts_list refresh() works when given
a contact object instead of an ID.  The previous code was a bit confusing
and called remove() twice for objects.
Bug 877767 - Set NSGraphicsContext flippedness properly in nsChildView::UpdateTitlebarImageBuffer(). r=smichaud
Bug 877767 - Draw window title on top of everything in drawintitlebar mode. r=smichaud
Bug 885405 - Don't override wantsDefaultClipping, use default clipping in -[ChildView drawRect:]. r=mattwoodrow
Bug 888458 - Don't assume there's a focusView during viewWillDraw; always get the dirty region from our own view. r=smichaud
Merge birch to m-c
Merge m-i to m-c
Bug 763070 - Give MOZ_CRASH() an optional string argument. r=waldo
Bug 802686 - s/MOZ_NOT_REACHED/MOZ_CRASH/ in Gecko. r=(see below)

r=tbsaunde for accessible
r=jmuizelaar for gfx
r=roc for layout
r=glandium for mozglue
r=jduell for netwerk
r=khuey for everything else

This is a mechanical change made with sed.  Later patches in this queue
clean up the whitespace errors and so on.
Bug 820686 - Rename MOZ_NOT_REACHED() and JS_NOT_REACHED() to MOZ_ASSUME_NOT_REACHED(). r=waldo

This includes a mechanical renaming of MOZ_NOT_REACHED to MOZ_ASSUME_NOT_REACHED in JS.  Later patches in this queue clean up whitespace errors and so on.
Bug 820686 - Remove code after MOZ_CRASH or MOZ_ASSUME_NOT_REACHED. r=(see below)

r=tbsaunde for accessible
r=jmuizelaar for gfx
r=waldo for js
r=roc for layout
r=glandium for mozglue
r=jduell for netwerk
r=khuey for everything else
Merge m-c to m-i
Bug 653881 - Rework XBL insertion points and clean up related code to more closely follow the Web Components model. Instead of maintaining a hashtable of insertion points in bindings (and removing insertions points from the tree) leave the insertion points in the tree as explicit placeholders and teach all other relevant code how to walk the explicit children of elements via two iterators (ExplicitChildIterator and FlattenedChildIterator). Note that this patch does not maintain 100% compatibility with the previous code: there are bug fixes and behavior changes included. For example, by having explicit insertion points in the bindings, it is now easier to handle dynamic changes to the bound element correctly (as well as, eventually, handling dynamic changes to the binding correctly). Patch originally by sicking. r=bzbarsky

--HG--
extra : rebase_source : 6926ae8ea57b20f4067b16bd3d7bd85bda854756
Bug 653881 - Push <xbl:children> in ancestor filter. r=bz,dbaron

--HG--
extra : rebase_source : 9aafffadd2451ca7274e99d7e07d0d71ea52ca02
Bug 653881 - Normalize the undisplayed map entry for <xbl:children>. r=dbaron

--HG--
extra : rebase_source : b851a3dc8f5bf576a42f0b639bdd51375413b123