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.
Merge birch to m-c
Merge m-i to m-c
Merge m-c to m-i