Commit Graph

351602 Commits

Author SHA1 Message Date
B2G Bumper Bot
b600b8e0ab Bumping manifests a=b2g-bump 2014-03-20 03:26:11 -07:00
B2G Bumper Bot
eafcf6a826 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c9674d674172
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #17369 from yurenju/nfc

Bug 963556: Update NFC Manager, Handover to use new shared nfc_utils.js. r=@alivedise

========

https://hg.mozilla.org/integration/gaia-central/rev/215146db2ced
Author: Garner Lee <garner.lee@telekom.com>
Desc: Bug 963556: Update NFC Manager, Handover to use new shared nfc_utils.js.

Conflicts:
	apps/system/js/nfc_handover_manager.js
	apps/system/js/nfc_manager_utils.js

========

https://hg.mozilla.org/integration/gaia-central/rev/6ece05f395b5
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #17363 from yurenju/stage2

Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau

========

https://hg.mozilla.org/integration/gaia-central/rev/42026d903e61
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps

Conflicts:
	Makefile
	apps/communications/build/build.js
	build/copy-build-stage-manifest.js
	build/test/integration/distribution.test.js
	build/utils-xpc.js
	build/utils.js
	build/webapp-manifests.js
2014-03-20 03:21:00 -07:00
B2G Bumper Bot
aa4e95793f Bumping manifests a=b2g-bump 2014-03-20 02:32:34 -07:00
B2G Bumper Bot
65a6f18370 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/80bbcc74cf4c
Author: Gabriele Svelto <gsvelto@mozilla.com>
Desc: Merge pull request #17360 from prcxuying/bug972308

Bug 972308 - Re-use the existing Audio object when playing keypad tones r=gsvelto

========

https://hg.mozilla.org/integration/gaia-central/rev/be68ad31b801
Author: ying.xu <ying.xu@spreadtrum.com>
Desc: Bug 972308 [DIALER]slow response when click on dialer panel

========

https://hg.mozilla.org/integration/gaia-central/rev/d783d8785066
Author: Jose M. Cantera <jmcanterafonseca@gmail.com>
Desc: Merge pull request #17348 from qdot/985795-contact-utils-misc-unit-test-fix

Bug 985795 - Only patch required single utils function versus mocking object

========

https://hg.mozilla.org/integration/gaia-central/rev/11e5b598d7f4
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 985795 - Only patch required single utils function versus mocking object
2014-03-20 02:30:49 -07:00
B2G Bumper Bot
a9f881b363 Bumping manifests a=b2g-bump 2014-03-20 00:03:54 -07:00
B2G Bumper Bot
f708a0bd08 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/1ee3ab22a3b9
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #17362 from alivedise/bugzilla/983290_master/orientation-hidden

Do not display perpendicular app on opening, r=timdream

========

https://hg.mozilla.org/integration/gaia-central/rev/4cea30574c5c
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Do not display perpendicular app on opening
2014-03-20 00:00:27 -07:00
Gene Lian
f064796b8e Bug 944890 - B2G SMS & MMS: remove convertTimeToInt(...) which is no longer needed (part 2, test cases). r=vicamo 2014-03-20 10:46:13 +08:00
Gene Lian
5418a89f3e Bug 944890 - B2G SMS & MMS: remove convertTimeToInt(...) which is no longer needed (part 1, implementation). r=vicamo 2014-03-20 10:45:55 +08:00
B2G Bumper Bot
8f41ae3770 Bumping manifests a=b2g-bump 2014-03-19 22:56:16 -07:00
B2G Bumper Bot
3dcc7a2429 Bumping gaia.json for 18 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6d2a2c5c58fc
Author: Yuren Ju <yurenju@gmail.com>
Desc: Revert "Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps"

This reverts commit 22a4d4f8065af46d23097bbaf898831d5c031ce3.

========

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

Bug 984718 - [keyboard refactor] Fix jshint errors, r=rudyl

========

https://hg.mozilla.org/integration/gaia-central/rev/81b608b07b34
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Add test/unit/.jshintrc

========

https://hg.mozilla.org/integration/gaia-central/rev/50c5e595decc
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for shiftkey_test.js

========

https://hg.mozilla.org/integration/gaia-central/rev/f47914733adf
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for page_test.js

========

https://hg.mozilla.org/integration/gaia-central/rev/551cd52291a0
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for doublespace_test.js

========

https://hg.mozilla.org/integration/gaia-central/rev/cd3add8bf7a6
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for touch_handler.js

========

https://hg.mozilla.org/integration/gaia-central/rev/9e3bc170b4dd
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for suggestions.js

========

https://hg.mozilla.org/integration/gaia-central/rev/8e66c29fe26d
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for shiftkey.js

========

https://hg.mozilla.org/integration/gaia-central/rev/9452db9378f7
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for settings.js

========

https://hg.mozilla.org/integration/gaia-central/rev/d02f5491ce03
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for pageview.js

========

https://hg.mozilla.org/integration/gaia-central/rev/487771ef78f9
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for page.js

========

https://hg.mozilla.org/integration/gaia-central/rev/5f4e55f0b705
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for layout.js

========

https://hg.mozilla.org/integration/gaia-central/rev/551fccef9224
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for key.js

========

https://hg.mozilla.org/integration/gaia-central/rev/9d57fcda4c16
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for input_field.js

========

https://hg.mozilla.org/integration/gaia-central/rev/53c23e9f2880
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for doublespace.js

========

https://hg.mozilla.org/integration/gaia-central/rev/56a516351ac1
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for boot.js

========

https://hg.mozilla.org/integration/gaia-central/rev/7b1506bd4160
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 984718 - Fix jshint errors for autocorrect.js
2014-03-19 22:55:19 -07:00
Vivien Nicolas
5de821871c Bug 985735 - dom/system/gonk/NetworkService.js: WARNING: no preprocessor directives found. r=gwagner 2014-03-20 13:01:34 +08:00
Vicamo Yang
9d5db529f2 Bug 985537: add runEmulatorShell to Marionette. r=mdas 2014-03-20 13:01:25 +08:00
B2G Bumper Bot
10a2f9c9ff Bumping manifests a=b2g-bump 2014-03-19 21:56:07 -07:00
B2G Bumper Bot
301e3ae796 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/e10dad3943a5
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #17067 from crh0716/975265

Bug 975265 - Add the support for LTE network types r=jaoo

========

https://hg.mozilla.org/integration/gaia-central/rev/d73ed53163d1
Author: Arthur Chen <crh0716@gmail.com>
Desc: Bug 975265 - Add the support for LTE network types
2014-03-19 21:50:12 -07:00
B2G Bumper Bot
0c190372a6 Bumping manifests a=b2g-bump 2014-03-19 21:41:07 -07:00
B2G Bumper Bot
d5f85f2c58 Bumping gaia.json for 15 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/536b0405f97c
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Merge pull request #17263 from gasolin/bubble-merge225" for possibly breaking gaia-ui tests on TBPL

This reverts commit 27c414d178694a17e7a2967fa377938163ac44ae, reversing
changes made to e592ec99013a43002171d1bd4be2f497c12ada88.

========

https://hg.mozilla.org/integration/gaia-central/rev/158472d7dba4
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Revert "Bug 985787 - Change requireApp to require to make includes work in search unit test" for possibly breaking gaia-ui tests on tbpl" because I didn't mean to revert this patch with everything else I reverted

This reverts commit b3564260d93fcf7d5127de26bb7f45d13b893a42.

========

https://hg.mozilla.org/integration/gaia-central/rev/864ab4a193de
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #17356 from yurenju/stage2

Bug 897352 - [gaia build system] Transition to a build_stage for assembl... r=@ochameau

========

https://hg.mozilla.org/integration/gaia-central/rev/3726337a624c
Author: Yuren Ju <yurenju@gmail.com>
Desc: Bug 897352 - [gaia build system] Transition to a build_stage for assembling apps

Conflicts:
	Makefile
	apps/communications/build/build.js
	build/copy-build-stage-manifest.js
	build/test/integration/distribution.test.js
	build/utils-xpc.js
	build/utils.js
	build/webapp-manifests.js

========

https://hg.mozilla.org/integration/gaia-central/rev/b92ea9307a62
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 971546 - [System2] Instantiable Screenshot" for possibly breaking gaia-ui tests on TBPL

This reverts commit ec5be24bd877588f60f6c64715b894157a20c603.

========

https://hg.mozilla.org/integration/gaia-central/rev/78c3bf7a1577
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 971577 - [System] Make visibility manager instantiable" for possibly breaking gaia-ui tests on TBPL

This reverts commit 73f3addd228aded613347bed46bd03a5941323d4.

========

https://hg.mozilla.org/integration/gaia-central/rev/fe177281e210
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 961800 - Implement Child Window Factory" for possibly breaking gaia-ui tests on TBPL

This reverts commit 439b23a04c6dba788293f577b1efe8c5d8843b78.

========

https://hg.mozilla.org/integration/gaia-central/rev/9ec410c953e8
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 971556 - [System2] Instantiable SourceView." for possibly breaking gaia-ui tests on TBPL

This reverts commit 0611fa4704a77acfe2001c80afe56a98a081df77.

========

https://hg.mozilla.org/integration/gaia-central/rev/df7f69246d85
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 970028 - Nicer activity opener animation" for possibly breaking gaia-ui tests on tbpl

This reverts commit 870a91032c9d6bd84713618df0e80f0b50962488.

========

https://hg.mozilla.org/integration/gaia-central/rev/ca4be0a3a1e7
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 974828 - [Settings][dsds] Outgoing data confirmation is wrong" for possibly breaking gaia-ui tests on tbpl

This reverts commit e592ec99013a43002171d1bd4be2f497c12ada88.

========

https://hg.mozilla.org/integration/gaia-central/rev/371d7310fbd4
Author: KWierso <kwierso@gmail.com>
Desc: Revert "Bug 985787 - Change requireApp to require to make includes work in search unit test" for possibly breaking gaia-ui tests on tbpl

This reverts commit 2e388f26d4a1b484d1fcfded068bc82d18ca4bf9.

========

https://hg.mozilla.org/integration/gaia-central/rev/eb1509d301d6
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #17347 from qdot/985787-search-unit-test-fix

Bug 985787 - Change requireApp to require to make includes work in search unit test

========

https://hg.mozilla.org/integration/gaia-central/rev/f07f5d82deee
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 985787 - Change requireApp to require to make includes work in search unit test

========

https://hg.mozilla.org/integration/gaia-central/rev/73e7584ac6cd
Author: Yuren Ju <yurenju@gmail.com>
Desc: Merge pull request #17314 from yurenju/big920431-2

Bug 920431 - [keyboard] keyboard_layout.json should be customizable r=@yurenju

========

https://hg.mozilla.org/integration/gaia-central/rev/fd6275559f57
Author: Rudy Lu <me@rudy.lu>
Desc: Bug 920431 - [keyboard] keyboard_layout.json should be customizable

Conflicts:
	build/settings.js
	build/test/integration/distribution.test.js
	build/webapp-manifests.js
2014-03-19 21:40:12 -07:00
B2G Bumper Bot
f68a32d905 Bumping manifests a=b2g-bump 2014-03-19 19:36:09 -07:00
B2G Bumper Bot
0da4b0cb09 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/f9ecda33f49c
Author: Ian Liu <iliu@mozilla.com>
Desc: Merge pull request #17175 from ian-liu/bluetooth/bug981626_support_sharing_picture_and_video_simultaneously

Bug 981626 - [Sora][gallery]Can't be shared when select picture and video simultaneously, r=@dominickuo

========

https://hg.mozilla.org/integration/gaia-central/rev/7c91fc678b71
Author: ian-liu <iliu@mozilla.com>
Desc: Bug 981626 - [Sora][gallery]Can't be shared when select picture and video simultaneously
2014-03-19 19:31:01 -07:00
B2G Bumper Bot
07dd0ec625 Bumping manifests a=b2g-bump 2014-03-19 18:46:05 -07:00
B2G Bumper Bot
f90b6ada98 Bumping gaia.json for 7 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ec735620fcff
Author: gasolin <gasolin@gmail.com>
Desc: Merge pull request #17263 from gasolin/bubble-merge225

cherry-pick Bubble-tea

========

https://hg.mozilla.org/integration/gaia-central/rev/94c37dafac4e
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 974828 - [Settings][dsds] Outgoing data confirmation is wrong

- update test
- change the way about how we show confirm window

========

https://hg.mozilla.org/integration/gaia-central/rev/cda9fc54ec17
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 970028 - Nicer activity opener animation

========

https://hg.mozilla.org/integration/gaia-central/rev/1ef05f8d675f
Author: Cédric de Saint Martin <cedric.dsm@tiolive.com>
Desc: Bug 971556 - [System2] Instantiable SourceView.

========

https://hg.mozilla.org/integration/gaia-central/rev/671cfdfc031b
Author: Alive Kuo <alegnadise@gmail.com>
Desc: Bug 961800 - Implement Child Window Factory

Conflicts:
	apps/system/js/app_transition_controller.js
	apps/system/js/app_window.js
	apps/system/js/app_window_manager.js
	apps/system/js/cards_view.js
	apps/system/style/window.css

========

https://hg.mozilla.org/integration/gaia-central/rev/79679041e3f0
Author: Rex Lee <rexboy@mozilla.com>
Desc: Bug 971577 - [System] Make visibility manager instantiable

========

https://hg.mozilla.org/integration/gaia-central/rev/9573ca6d00fa
Author: Timothy Guan-tin Chien <timdream@gmail.com>
Desc: Bug 971546 - [System2] Instantiable Screenshot
2014-03-19 18:40:48 -07:00
B2G Bumper Bot
3376b30479 Bumping manifests a=b2g-bump 2014-03-19 17:51:28 -07:00
B2G Bumper Bot
4a58348747 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/c123cdbc24cb
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Merge pull request #17344 from mcav/apop

Bug 983167 - [email/POP3] broken node-crypto.js shim causes auth failure...

========

https://hg.mozilla.org/integration/gaia-central/rev/fc451944db53
Author: Marcus Cavanaugh <m@mcav.com>
Desc: Bug 983167 - [email/POP3] broken node-crypto.js shim causes auth failure when attempting APOP auth. r=asuth
2014-03-19 17:46:17 -07:00
B2G Bumper Bot
d6f8e00b88 Bumping manifests a=b2g-bump 2014-03-19 14:47:11 -07:00
B2G Bumper Bot
2c4ae16377 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/50872ab77f6b
Author: Fabrice Desré <fabrice@mozilla.com>
Desc: Bug 983760 - Dont show crash screen if tab is not currently active. r=daleharvey
2014-03-19 14:45:42 -07:00
Dave Hylands
1a41bf9982 Bug 983848 - Don't use settings db in UpdatePrompt when running under xpcshell. r=bent 2014-03-19 11:58:01 -07:00
B2G Bumper Bot
0dffacd2c9 Bumping manifests a=b2g-bump 2014-03-19 11:51:08 -07:00
B2G Bumper Bot
0799b99da7 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/181049c75f53
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #17223 from vingtetun/bug984151

Bug 984151 - Make the contacts image pull up effect smoother. r=arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/752987e94d55
Author: Vivien Nicolas <21@vingtetun.org>
Desc: Bug 984151 - Make the contacts image pull up effect smoother. r=arcturus

========

https://hg.mozilla.org/integration/gaia-central/rev/de18d91d9202
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #17337 from vingtetun/bug981610.shared

Bug 981610 - Remove some CSS warnings on shared/. r=arnau

========

https://hg.mozilla.org/integration/gaia-central/rev/3e386227223e
Author: Vivien Nicolas <21@vingtetun.org>
Desc: Bug 981610 - Remove some CSS warnings on shared/. r=arnau
2014-03-19 11:45:59 -07:00
B2G Bumper Bot
551a0c0878 Bumping manifests a=b2g-bump 2014-03-19 11:11:06 -07:00
B2G Bumper Bot
4adc6fb455 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/ac9e11ac7ef1
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #17334 from vingtetun/bug981610.keyboards

Bug 981610 - Remove some CSS warnings on the keyboard app. r=janjongboom

========

https://hg.mozilla.org/integration/gaia-central/rev/9eb973a412fc
Author: Vivien Nicolas <21@vingtetun.org>
Desc: Bug 981610 - Remove some CSS warnings on the keyboard app. r=janjongboom

========

https://hg.mozilla.org/integration/gaia-central/rev/72858e9f347e
Author: Arnau <arnau@arnaumarch.com>
Desc: Merge pull request #17202 from rnowm/981887

Bug 981887 - Update button design using current BB structure and "Plan B" design

========

https://hg.mozilla.org/integration/gaia-central/rev/f86b04fd966d
Author: rnowm <arnau@arnaumarch.com>
Desc: Bug 981887 - Update button design using current BB structure and "Plan B" design
2014-03-19 11:06:04 -07:00
B2G Bumper Bot
f8df9eab67 Bumping manifests a=b2g-bump 2014-03-19 10:31:03 -07:00
B2G Bumper Bot
dff1066c55 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7b407971f5e9
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Merge pull request #17214 from qdot/983507-flight-mode-radio-off

Bug 983507 - Make airplane mode icon appear via airplaneMode setting, not RIL status

========

https://hg.mozilla.org/integration/gaia-central/rev/2f72a17e70d9
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 983507 - Make airplane mode icon appear via airplaneMode setting, not RIL status
2014-03-19 10:25:51 -07:00
B2G Bumper Bot
12b1a847ca Bumping manifests a=b2g-bump 2014-03-19 10:17:43 -07:00
B2G Bumper Bot
f04e82589b Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/a6daf6b427d8
Author: russnicoletti <rnicoletti@mozilla.com>
Desc: Merge pull request #17215 from russnicoletti/bug982743

Bug 982743 - [B2G][Clock]Timer section's Resume button illuminates and doesn't resume timer countdown r=mcav

========

https://hg.mozilla.org/integration/gaia-central/rev/b583b37dab27
Author: Russ Nicoletti <rnicoletti@mozilla.com>
Desc: Bug 982743 - [B2G][Clock]Timer section's Resume button illuminates and doesn't resume timer countdown
2014-03-19 10:15:57 -07:00
B2G Bumper Bot
7394606f24 Bumping manifests a=b2g-bump 2014-03-19 09:01:04 -07:00
B2G Bumper Bot
c89d393ace Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/40a8306a7319
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #17297 from etiennesegonzac/bug-982196-reflow-helper-upgrade

Bug 982196 - Upgrading the ReflowHelper to use the new devtools tooling.

========

https://hg.mozilla.org/integration/gaia-central/rev/21a7faa34a1c
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 982196 - Upgrading the ReflowHelper to use the new devtools tooling.
r=gaye,janx

========

https://hg.mozilla.org/integration/gaia-central/rev/cd4d77e23bfe
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Merge pull request #17290 from etiennesegonzac/bug-984882-callscreen-display-l10n-followup

Bug 984882 - 946874 l10n follow up. r=rik

========

https://hg.mozilla.org/integration/gaia-central/rev/e03df3a4285f
Author: Etienne Segonzac <etienne@segonzac.info>
Desc: Bug 984882 - 946874 l10n follow up. r=rik
2014-03-19 08:55:58 -07:00
Carsten "Tomcat" Book
173ff6dc38 Merge mozilla-central to b2g-inbound 2014-03-19 16:30:49 +01:00
Andrew Halberstadt
a97cdd879e Bug 983262 - Remove obsolete b2g mochitest json manifests, r=jmaher 2014-03-19 11:23:29 -04:00
Carsten "Tomcat" Book
5d1e3faff6 merge b2g-inbound to mozilla-central 2014-03-19 16:22:07 +01:00
Carsten "Tomcat" Book
a969645532 merge fx-team to mozilla-central 2014-03-19 16:21:06 +01:00
Carsten "Tomcat" Book
b6ea0644a4 Backed out changeset 094decae8ff3 (bug 917755) for mochitest-1 bustage on a CLOSED TREE 2014-03-19 09:47:43 +01:00
Carsten "Tomcat" Book
761aff7993 Backed out changeset 002dbc057a74 (bug 917755) 2014-03-19 09:46:13 +01:00
Carsten "Tomcat" Book
d583b802a8 Backed out changeset 92e5d79ec57f (bug 917755) 2014-03-19 09:46:12 +01:00
Carsten "Tomcat" Book
cf62801d4f Backed out changeset 3b41ab878fcd (bug 917755) 2014-03-19 09:46:09 +01:00
Carsten "Tomcat" Book
394bd4d67d Backed out changeset 8ad57cf09e75 (bug 917755) 2014-03-19 09:46:07 +01:00
Carsten "Tomcat" Book
748983c4c5 Backed out changeset 4771c2b309ad (bug 917755) 2014-03-19 09:46:04 +01:00
Carsten "Tomcat" Book
bb46c9b270 Backed out changeset 896bfaeab866 (bug 917755) 2014-03-19 09:46:03 +01:00
Carsten "Tomcat" Book
c4ef79bf25 Backed out changeset 1b7530ddb0af (bug 917755) 2014-03-19 09:46:01 +01:00
Carsten "Tomcat" Book
1c1e484845 Backed out changeset f7e676be8fa0 (bug 918189) 2014-03-19 09:45:58 +01:00
Carsten "Tomcat" Book
dd70a06887 Backed out changeset e60fe593236d (bug 918189) 2014-03-19 09:45:57 +01:00
Carsten "Tomcat" Book
76217d976d Backed out changeset 2f3187619c9e (bug 918189) 2014-03-19 09:45:48 +01:00