Bug 915002: Convert optional notification arguments to webidl dictionary, add directional/lang arguments; r=bz r=fabrice
Backed out changeset cb1fdb7df155 (bug 915002) again for build bustage
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/60c6a7c8222d
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #10044 from Joshua-S/bug-816455

Bug 816455 - [PDF Viewer] Missing whitespace in description and spelling error in RE...

========

https://hg.mozilla.org/integration/gaia-central/rev/fb3f043736ed
Author: Joshua Smith <joshua-smith@verizon.net>
Desc:  [PDF Viewer] Missing whitespace in description and spelling error in README
Merge m-c to b2g-inbound
Bug 873380 - Part 1: Refined the error report policy for card lock functionality. r=smaug. sr=hsinyi
Bug 873380 - Part 2: Bluetooth changes for iccCardLockError. r=echou
Bug 873380 - Part 3: RIL changes for icc card lock error. r=allstars.chh
Bug 873380 - Part 4: Add test for IccCardLockError in test_interfaces.html. r=smaug
Bug 923407 - Set list adapter to null when destroying BrowserSearch view. r=lucasr
Bug 923519 - Pre: Expose MOZ_ANDROID_SHARED_{ID,ACCOUNT_TYPE} to mobile/android/**/Makefile.in. r=gps
Bug 923519 - Remove resource preprocessing. r=nalexander

--HG--
rename : mobile/android/base/resources/xml/preferences.xml.in => mobile/android/base/resources/xml/preferences.xml
rename : mobile/android/base/resources/xml/preferences_customize.xml.in => mobile/android/base/resources/xml/preferences_customize.xml
rename : mobile/android/base/resources/xml/searchable.xml.in => mobile/android/base/resources/xml/searchable.xml
rename : mobile/android/base/resources/xml/sync_authenticator.xml.in => mobile/android/base/resources/xml/sync_authenticator.xml
rename : mobile/android/base/resources/xml/sync_options.xml.in => mobile/android/base/resources/xml/sync_options.xml
rename : mobile/android/base/resources/xml/sync_syncadapter.xml.in => mobile/android/base/resources/xml/sync_syncadapter.xml
Bug 902560: FakeProfileTestCase deletes testing directory if it exists. r=nalexander
Merge m-c to fxteam
Bumping gaia.json for 2 gaia-central revision(s) a=gaia-bump

========

https://hg.mozilla.org/integration/gaia-central/rev/c7c750d66279
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Merge pull request #12680 from timdream/bug923788

Bug 923788 - Calculate position of lock screen icons based with calc() from center, r=gweng

========

https://hg.mozilla.org/integration/gaia-central/rev/4fb51c9b02ec
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 923788 - Calculate position of lock screen icons based with calc() from center
merge fx-team to mozilla-central
merge b2g-inbound to mozilla-central
merge mozilla-central to mozilla-inbound